Changeset 5999

Timestamp:

02/20/15 13:54:48 (9 years ago)

Author:

Twan Goosen

Message:

Replaced 'language' and 'languages' fields with 'language code' in web app.
TODO: render full language name (get it from the language code utils map) and generate link to language info page
Refs #553

Location:

vlo/trunk

Files:

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

vlo/trunk/vlo-commons/src/main/resources/VloConfig.xml

@@ -70 +70 @@
     <!-- Fields shown as facets on the search page -->
     <facetFields>        
-        <facetField>language</facetField>
+        <facetField>languageCode</facetField>
         <facetField>collection</facetField>
         <facetField>resourceClass</facetField>
@@ -86 +86 @@
         
     <simpleSearchFacetFields>
-        <simpleSearchFacetField>language</simpleSearchFacetField>
+        <simpleSearchFacetField>languageCode</simpleSearchFacetField>
         <simpleSearchFacetField>collection</simpleSearchFacetField>
         <simpleSearchFacetField>resourceClass</simpleSearchFacetField>
@@ -97 +97 @@
         <searchResultField>name</searchResultField>
         <searchResultField>country</searchResultField>
-        <searchResultField>languages</searchResultField>
+        <searchResultField>languageCode</searchResultField>
         <searchResultField>modality</searchResultField>
         <searchResultField>subject</searchResultField>

vlo/trunk/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java

@@ -631 +631 @@
 
         List<String> expResult = Arrays.asList(
-                "language",
+                "languageCode",
                 "collection",
                 "resourceClass",
@@ -653 +653 @@
     public void testGetAllFacetsField() {
         final String[] expItems = new String[]{
-            "language",
+            "languageCode",
             "collection",
             "resourceClass",

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSolrSpringConfig.java

@@ -96 +96 @@
             FacetConstants.FIELD_DESCRIPTION,
             FacetConstants.FIELD_COLLECTION,
-            FacetConstants.FIELD_LANGUAGES,
+            FacetConstants.FIELD_LANGUAGE_CODE,
             FacetConstants.FIELD_MODALITY,
             FacetConstants.FIELD_CONTINENT,

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

@@ -59 +59 @@
     private final static Collection<String> UNESCAPED_VALUE_FIELDS
             = ImmutableSet.of(
-                    FacetConstants.FIELD_LANGUAGES
+                    FacetConstants.FIELD_LANGUAGE_CODE
             );
 
@@ -119 +119 @@
     private Label createValueLabel(String id, final IModel<String> facetNameModel, final IModel<String> originalValueModel) {
         final String fieldName = facetNameModel.getObject();
-        
+
         // allow for postprocessing or wrapping of the value model depending on the field
         final IModel<String> valueModel = getValueModel(facetNameModel, originalValueModel);
-        
+
         if (SMART_LINK_FIELDS.contains(fieldName)) {
             // create label that generates links
@@ -129 +129 @@
             // add a label for the facet value
             final Label fieldLabel = new Label(id, valueModel);
-            
+
             // some selected fields may have HTML that needs to be preserved...
             fieldLabel.setEscapeModelStrings(!UNESCAPED_VALUE_FIELDS.contains(fieldName));

vlo/trunk/vlo-web-app/src/main/resources/fieldNames.properties

@@ -17 +17 @@
 field.collection=Collection
 field.name=Name
-field.language=Language
-field.languages=Language
+field.languageCode=Language
 field.genre=Genre
 field.description=Description