From 5818a27d7bc60fb0174a6d8288e05e3d16ba87d3 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 4 May 2016 06:10:09 +0000 Subject: [PATCH] - Changed log level in RelationAtttributeImportTool to debug for all none error messages - Fixed some typos in the Foundry documentation git-svn-id: https://svn.libreccm.org/ccm/trunk@4047 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/RelationAttributeImportTool.java | 50 +- .../lib/template-tags/content-items.xsl | 432 +++++++++--------- .../foundry/lib/template-tags/data-tags.xsl | 60 +-- 3 files changed, 273 insertions(+), 269 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/RelationAttributeImportTool.java b/ccm-cms/src/com/arsdigita/cms/RelationAttributeImportTool.java index f673a5465..41b82e219 100644 --- a/ccm-cms/src/com/arsdigita/cms/RelationAttributeImportTool.java +++ b/ccm-cms/src/com/arsdigita/cms/RelationAttributeImportTool.java @@ -25,10 +25,10 @@ import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; /** - * This is a helper tool for loading data for the RelationAttributes (Database - * Driven Enums) into the database in a loader of a module. This helper class + * This is a helper tool for loading data for the RelationAttributes (Database + * Driven Enums) into the database in a loader of a module. This helper class * uses a XML format for loading the enum data, which looks like this: - * + * * 
  * <ddenums>
  *     <ddenum name="...">
@@ -39,27 +39,27 @@ import org.xml.sax.helpers.DefaultHandler;
  *     </ddenum>
  * </ddenums>
  *
- * - * The root element is {@code } which can appear only once per file. - * The {@code } elements as child - * elements. The {@code element has one attribute, {@code name} which - * contains the name of the enumeration. Each {@code } may have multiple + * + * The root element is {@code } which can appear only once per file. + * The {@code } elements as child + * elements. The {@code element has one attribute, {@code name} which + * contains the name of the enumeration. Each {@code } may have multiple * {@code} child elements. The {@code } element has three attributes. - * + * *
*
{@code key}
The key of the entry. This attribute is mandatory.
- *
{@code lang}
The language of the entry. This attribute is + *
{@code lang}
The language of the entry. This attribute is * mandatory. The combination of {@code key} * and {@code lang} should be unique.
- *
{@code id}
This attribute is optional and contains the + *
{@code id}
This attribute is optional and contains the * database id of the entry if necessary. The * value is maybe ignored by this import tool.
*
- * - * Each entry has at least a {@code } element as child. The {@code } - * element contains the value of the enum entry. Optionally there can also be + * + * Each entry has at least a {@code } element as child. The {@code } + * element contains the value of the enum entry. Optionally there can also be * an description element containing a description of the entry. - * + * * @author Jens Pelzetter * @version $Id$ */ @@ -67,7 +67,7 @@ public class RelationAttributeImportTool { /** Internal logger instance to faciliate debugging. Enable logging output * by editing /WEB-INF/conf/log4j.properties int hte runtime environment - * and set com.arsdigita.cms.RelationAttributeImportTool=DEBUG + * and set com.arsdigita.cms.RelationAttributeImportTool=DEBUG * by uncommenting or adding the line. */ private final static Logger LOGGER = Logger.getLogger(RelationAttributeImportTool.class); @@ -168,18 +168,18 @@ public class RelationAttributeImportTool { currentKey)); return; } - - LOGGER.warn("Creating RelationAttribute entry with this values:"); - LOGGER.warn(String.format("\tcurrentEnum = '%s'", currentEnum)); - LOGGER.warn(String.format("\tcurrentKey = '%s'", currentKey)); - LOGGER.warn(String.format("\tcurrentLang = '%s'", currentLang)); - LOGGER.warn(String.format("\tcurrentValue = '%s'", currentValue)); - + + LOGGER.debug("Creating RelationAttribute entry with this values:"); + LOGGER.debug(String.format("\tcurrentEnum = '%s'", currentEnum)); + LOGGER.debug(String.format("\tcurrentKey = '%s'", currentKey)); + LOGGER.debug(String.format("\tcurrentLang = '%s'", currentLang)); + LOGGER.debug(String.format("\tcurrentValue = '%s'", currentValue)); + final RelationAttribute entry = new RelationAttribute(); if ((currentId != null) && !currentId.isEmpty()) { entry.setID(new BigDecimal(currentId)); - } - + } + entry.setAttribute(currentEnum); entry.setKey(currentKey); entry.setLanguage(currentLang); diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl index 98086b13e..e8f3fa384 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl @@ -1,9 +1,9 @@