Merge branch 'issue780' into development

clarin-eric · Jan 11, 2016 · ee658bc · ee658bc
2 parents dce96ca + 0ede9f1
commit ee658bc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java b/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java
@@ -85,7 +85,7 @@ public class FacetConstants {
      * regular expression that matches the language prefix in description (group
      * 1 matches the ISO639-3 language code)
      */
-    public static final String DESCRIPTION_LANGUAGE_PATTERN = "^\\{lang='([A-z-]+)'\\}";
+    public static final String DESCRIPTION_LANGUAGE_PATTERN = "^\\{(name|code):.*\\}";
 
     /**
      * regular expression that matches the syntax of the 'languageCode' field

diff --git a/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java b/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java
@@ -19,7 +19,6 @@
 import eu.clarin.cmdi.vlo.wicket.components.LanguageInfoLink;
 import com.google.common.collect.ImmutableSet;
 import eu.clarin.cmdi.vlo.FacetConstants;
-import eu.clarin.cmdi.vlo.JavaScriptResources;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.DocumentField;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
@@ -38,9 +37,6 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.markup.html.basic.SmartLinkMultiLineLabel;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.list.ListItem;

diff --git a/...app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FieldValueConverterProviderImpl.java b/...app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FieldValueConverterProviderImpl.java
@@ -100,6 +100,7 @@ public String convertToString(String fieldValue, Locale locale) throws Conversio
 
         @Override
         public String convertToString(String fieldValue, Locale locale) throws ConversionException {
+            //For now, we simply ignore this information (see <https://trac.clarin.eu/ticket/780>)
             return fieldValue.replaceAll(FacetConstants.DESCRIPTION_LANGUAGE_PATTERN, "");
         }