Changeset 5020

Timestamp:

04/22/14 14:46:14 (10 years ago)

Author:

Twan Goosen

Message:

replaced 'language' facet with 'languages', which includes a link to the language info page

Location:

vlo/branches/vlo-3.0

Files:

• vlo-commons/src/main/resources/VloConfig.xml (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java (modified) (4 diffs)
• vlo-web-app/src/main/resources/fieldNames.properties (modified) (1 diff)

vlo/branches/vlo-3.0/vlo-commons/src/main/resources/VloConfig.xml

@@ -97 +97 @@
         <searchResultField>name</searchResultField>
         <searchResultField>country</searchResultField>
-        <searchResultField>language</searchResultField>
+        <searchResultField>languages</searchResultField>
         <searchResultField>modality</searchResultField>
         <searchResultField>subject</searchResultField>

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -210 +210 @@
             FacetConstants.FIELD_DESCRIPTION,
             FacetConstants.FIELD_COLLECTION,
-            FacetConstants.FIELD_LANGUAGE,
+            FacetConstants.FIELD_LANGUAGES,
             FacetConstants.FIELD_MODALITY,
             FacetConstants.FIELD_CONTINENT,

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels.record;
 
+import com.google.common.collect.ImmutableSet;
+import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.DocumentField;
@@ -24 +26 @@
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
 import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -46 +49 @@
 public class FieldsTablePanel extends Panel {
 
+    /**
+     * List of fields that should be rendered unescaped, {@literal i.e.} HTML
+     * contained in the field should be preserved
+     */
+    private final static Collection<String> UNESCAPED_VALUE_FIELDS = ImmutableSet.of(FacetConstants.FIELD_LANGUAGES);
+
     @SpringBean
     private VloConfig vloConfig;
@@ -66 +75 @@
                     @Override
                     protected void populateItem(final ListItem fieldValueItem) {
-                        fieldValueItem.add(new Label("value", fieldValueItem.getModel()));
+                        // add a label for the facet value
+                        final Label fieldLabel = new Label("value", fieldValueItem.getModel());
+                        // some selected fields may have HTML that needs to be preserved...
+                        fieldLabel.setEscapeModelStrings(!UNESCAPED_VALUE_FIELDS.contains(fieldNameModel.getObject()));
+                        fieldValueItem.add(fieldLabel);
+
+                        // add a link for selecting the value in the search
                         fieldValueItem.add(createFacetSelectLink("facetSelect", fieldNameModel, fieldValueItem.getModel()));
                     }

vlo/branches/vlo-3.0/vlo-web-app/src/main/resources/fieldNames.properties

@@ -18 +18 @@
 field.name=Name
 field.language=Language
+field.languages=Language
 field.genre=Genre
 field.description=Description