Changeset 4973

Timestamp:

04/14/14 15:09:07 (10 years ago)

Author:

Twan Goosen

Message:

Added breadcrumbs rendering for content search filter

File:

• vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/BreadCrumbPanel.java (modified) (6 diffs)

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels;
 
+import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -94 +95 @@
 
             @Override
-            protected void populateItem(Item<Map.Entry<String, FacetSelection>> item) {
+            protected void populateItem(final Item<Map.Entry<String, FacetSelection>> item) {
                 final IModel<Map.Entry<String, FacetSelection>> selectionModel = item.getModel();
                 // add a label for the selected facet value(s)
@@ -102 +103 @@
                     public <C> IConverter<C> getConverter(Class<C> type) {
                         // converter to render the value(s) nicely
-                        return (IConverter<C>) selectionConverter;
+                        return (IConverter<C>) new SelectionConverter(item.getModelObject().getKey());
                     }
 
@@ -145 +146 @@
      * collection (if singleton, show its value; if multiple, comma separated)
      */
-    private final static IConverter<FacetSelection> selectionConverter = new IConverter<FacetSelection>() {
+    private class SelectionConverter implements IConverter<FacetSelection> {
+
+        private final String facet;
+
+        public SelectionConverter(String facet) {
+            this.facet = facet;
+        }
 
         @Override
@@ -154 +161 @@
         @Override
         public String convertToString(FacetSelection selection, Locale locale) {
+            switch (selection.getSelectionType()) {
+                case AND:
+                    return getCollectionString(selection, " and ");
+                case OR:
+                    return getCollectionString(selection, " or ");
+                case NOT:
+                    return "not [" + getCollectionString(selection, " or ") + "]";
+                case NOT_EMPTY:
+                    return getAnyValueString();
+                default:
+                    return facet;
+            }
+
+        }
+
+        private String getAnyValueString() {
+            if (FacetConstants.FIELD_SEARCH_SERVICE.equals(facet)) {
+                return "Content searchable";
+            }
+            return "any " + facet;
+        }
+
+        public String getCollectionString(FacetSelection selection, String valueSeparator) {
             final Collection<String> value = selection.getValues();
             //TODO: include selection type
@@ -164 +194 @@
                 final StringBuilder sb = new StringBuilder(iterator.next());
                 while (iterator.hasNext()) {
-                    sb.append(", ").append(iterator.next());
+                    sb.append(valueSeparator).append(iterator.next());
                 }
                 return sb.toString();