Changeset 4666

Timestamp:

03/10/14 15:52:30 (10 years ago)

Author:

Twan Goosen

Message:

added filtering of values in all values panel

Location:

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

Files:

• panels/AllFacetValuesPanel.html (modified) (1 diff)
• panels/AllFacetValuesPanel.java (modified) (6 diffs)
• provider/FacetFieldValuesProvider.java (modified) (5 diffs)

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

@@ -27 +27 @@
             <form wicket:id="options">
                 <p>Sort by <select wicket:id="sort"><option>name</option><option>count</option></select></p>
-                <div>Search: <input type="text" /></div>
+                <div>Search: <input wicket:id="filter" type="text" /></div>
             </form>
             <div wicket:id="facetValuesContainer" class="sortedFacet">

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

@@ -25 +25 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
@@ -31 +32 @@
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.panel.GenericPanel;
@@ -37 +39 @@
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 
@@ -49 +52 @@
     private final FacetFieldValuesProvider valuesProvider;
     private final WebMarkupContainer valuesContainer;
+    private IModel<String> filterModel = new Model<String>();
 
     public AllFacetValuesPanel(String id, IModel<FacetField> model) {
         super(id, model);
-        valuesProvider = new FacetFieldValuesProvider(model);
+        // create a provider that shows all values and is sorted by name by default
+        valuesProvider = new FacetFieldValuesProvider(model, Integer.MAX_VALUE, FieldValueOrderSelector.NAME_SORT) {
 
+            @Override
+            protected IModel<String> getFilterModel() {
+                // filters the values
+                return filterModel;
+            }
+
+        };
+
+        // create a container for the values to allow for AJAX updates
         valuesContainer = new WebMarkupContainer("facetValuesContainer");
         valuesContainer.setOutputMarkupId(true);
         add(valuesContainer);
 
+        // create the view of the actual values
         final DataView<FacetField.Count> valuesView = createValuesView("facetValue");
         valuesContainer.add(valuesView);
 
+        // create the form for selection sort option and entering filter string
         final Form optionsForm = createOptionsForm("options");
         optionsForm.setOutputMarkupId(true);
@@ -101 +117 @@
         final DropDownChoice<SortParam<FieldValuesOrder>> sortSelect
                 = new FieldValueOrderSelector("sort", new PropertyModel<SortParam<FieldValuesOrder>>(valuesProvider, "sort"));
-        sortSelect.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+        sortSelect.add(new OnChangeAjaxBehavior() {
 
             @Override
@@ -110 +126 @@
         });
         options.add(sortSelect);
+
+        final TextField filterField = new TextField("filter", filterModel);
+        filterField.add(new AjaxFormComponentUpdatingBehavior("keyup") {
+
+            @Override
+            protected void onUpdate(AjaxRequestTarget target) {
+                target.add(valuesContainer);
+            }
+        });
+        options.add(filterField);
         return options;
     }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.provider;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Ordering;
 import eu.clarin.cmdi.vlo.pojo.FieldValuesOrder;
@@ -67 +70 @@
     }
 
+    /**
+     * override to achieve filtering
+     *
+     * @return model of string items should begin with
+     */
+    protected IModel<String> getFilterModel() {
+        return null;
+    }
+
     @Override
     public Iterator<? extends FacetField.Count> iterator(long first, long count) {
-        // TODO: From old VLO:
-        // IGNORABLE_VALUES (like "unknown") are move to the back of the list and should only be shown when you click "more...", unless the list is too small then whe can just show them.
+        // get all the values
         final List<FacetField.Count> values = model.getObject().getValues();
-        return getOrdering().sortedCopy(values).listIterator((int) first);
+        // filter results
+        final Iterable<Count> filtered = filter(values);
+        // sort what remains
+        final ImmutableList sorted = getOrdering().immutableSortedCopy(filtered);
+        // return iterator starting at specified offset
+        return sorted.listIterator((int) first);
     }
 
     @Override
     public long size() {
-        // Actual value count might be higher than what we want to show
-        return Math.min(maxNumberOfItems, model.getObject().getValueCount());
+        if (hasFilter()) {
+            final List<FacetField.Count> values = model.getObject().getValues();
+            return Iterables.size(filter(values));
+        } else {
+            // Use value count from Solr, faster.
+            //
+            // Actual value count might be higher than what we want to show
+            // so get minimum.
+            return Math.min(maxNumberOfItems, model.getObject().getValueCount());
+        }
     }
 
@@ -89 +113 @@
     public void detach() {
         model.detach();
+    }
+
+    private Iterable<FacetField.Count> filter(List<FacetField.Count> list) {
+        if (hasFilter()) {
+            final String filterValue = getFilterModel().getObject().toLowerCase();
+            return Iterables.filter(list, new Predicate<FacetField.Count>() {
+                @Override
+                public boolean apply(Count input) {
+                    return input.getName().toLowerCase().startsWith(filterValue);
+                }
+            });
+        } else {
+            return list;
+        }
+    }
+
+    private boolean hasFilter() {
+        return !(getFilterModel() == null || getFilterModel().getObject() == null || getFilterModel().getObject().isEmpty());
     }
 
@@ -112 +154 @@
         @Override
         public int compare(Count arg0, Count arg1) {
+            // TODO: From old VLO:
+            // IGNORABLE_VALUES (like "unknown") are move to the back of the list and should only be shown when you click "more...", unless the list is too small then whe can just show them.
             return Long.compare(arg0.getCount(), arg1.getCount());
         }
@@ -120 +164 @@
         @Override
         public int compare(Count arg0, Count arg1) {
+            // TODO: From old VLO:
+            // IGNORABLE_VALUES (like "unknown") are move to the back of the list and should only be shown when you click "more...", unless the list is too small then whe can just show them.
             return arg0.getName().compareTo(arg1.getName());
         }