Changeset 5995

Timestamp:

02/19/15 09:36:41 (9 years ago)

Author:

Twan Goosen

Message:

Stripping of language prefix in descriptions
Refs #699

Location:

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket

Files:

• model/DescriptionFieldModel.java (added)
• model/SolrFieldStringModel.java (modified) (6 diffs)
• panels/record/FieldsTablePanel.java (modified) (4 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/SolrFieldStringModel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.model;
 
+import eu.clarin.cmdi.vlo.FacetConstants;
 import java.util.Collection;
 import java.util.Iterator;
@@ -25 +26 @@
 /**
  * Model that provides field values as String values for a given field values
- * model, both for singular values and multiple values (imploding the
- * latter into a single string)
+ * model, both for singular values and multiple values (imploding the latter
+ * into a single string)
  *
  * @author twagoo
@@ -33 +34 @@
 
     private final IModel<Collection<Object>> fieldModel;
+    private final String field;
 
     /**
@@ -42 +44 @@
      */
     public SolrFieldStringModel(IModel<SolrDocument> documentModel, String fieldName) {
-        this(new SolrFieldModel<Object>(documentModel, fieldName));
-    }
-
-    /**
-     *
-     * @param fieldModel model that provides field values as a collection
-     */
-    public SolrFieldStringModel(IModel<Collection<Object>> fieldModel) {
-        this.fieldModel = fieldModel;
+        fieldModel = new SolrFieldModel<Object>(documentModel, fieldName);
+        field = fieldName;
     }
 
@@ -65 +60 @@
         final Iterator<Object> iterator = fieldValues.iterator();
         if (iterator.hasNext()) {
-            final String firstValue = iterator.next().toString();
+            final String firstValue = postprocessValue(iterator.next().toString());
             if (iterator.hasNext()) {
                 return getMultipleValuesString(firstValue, iterator);
@@ -93 +88 @@
     }
 
+    private String postprocessValue(String value) {
+        if (value != null) {
+            if (FacetConstants.FIELD_DESCRIPTION.equals(field)) {
+                //remove language prefix
+                return value.replaceAll(FacetConstants.DESCRIPTION_LANGUAGE_PATTERN, "");
+            }
+        }
+        return value;
+    }
+
 }

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

@@ -24 +24 @@
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
+import eu.clarin.cmdi.vlo.wicket.model.DescriptionFieldModel;
 import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
@@ -116 +117 @@
     }
 
-    private Label createValueLabel(String id, final IModel<String> facetNameModel, final IModel<String> valueModel) {
+    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
@@ -124 +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));
@@ -155 +161 @@
     }
 
+    private IModel<String> getValueModel(IModel<String> facetNameModel, IModel<String> valueModel) {
+        if (FacetConstants.FIELD_DESCRIPTION.equals(facetNameModel.getObject())) {
+            //wrap in model that removes the language prefix
+            return new DescriptionFieldModel(valueModel);
+        }
+        return valueModel;
+    }
+
 }