Changeset 2025

Timestamp:

07/11/12 07:35:47 (12 years ago)

Author:

teckart

Message:

Added parameter "facetMinOccurs" to filter for minimal frequency on ShowAllFacetValuesPage?

Location:

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages

Files:

• AlphabeticalPanel.java (modified) (3 diffs)
• FacetBoxPanel.java (modified) (2 diffs)
• ShowAllFacetValuesPage.html (modified) (1 diff)
• ShowAllFacetValuesPage.java (modified) (1 diff)

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/AlphabeticalPanel.java

@@ -13 +13 @@
 import java.util.Map.Entry;
 import java.util.TreeMap;
+
 import org.apache.solr.client.solrj.response.FacetField.Count;
 import org.apache.wicket.markup.html.WebMarkupContainer;
-
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.ExternalLink;
@@ -28 +28 @@
 
     private static final long serialVersionUID = 1L;
-    private List<String> foundCharacters = new LinkedList<String>();
+    private final List<String> foundCharacters = new LinkedList<String>();
+    private final Integer facetMinOccurs;
 
-    public AlphabeticalPanel(String id, IDataProvider data, final SearchPageQuery query) {
+    public AlphabeticalPanel(String id, IDataProvider data, final SearchPageQuery query, Integer facetMinOccurs) {
         super(id);
+        this.facetMinOccurs = facetMinOccurs;
 
         RepeatingView sortedDataViewLeft = new RepeatingView("sortedDataViewLeft");
@@ -97 +99 @@
         while (iter.hasNext()) {
             Count count = iter.next();
+            if(count.getCount() < facetMinOccurs)
+                continue;
             Character key = count.getName().trim().charAt(0);
             if (Character.isDigit(key)) {

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java

@@ -37 +37 @@
     }
     
-    @SuppressWarnings("serial")
+    @SuppressWarnings({"serial"})
     public FacetBoxPanel create(final SearchPageQuery query) {
         final FacetField facetField = (FacetField) getDefaultModelObject();
@@ -66 +66 @@
         PageParameters pageParameters = query.getPageParameters();
         pageParameters.add(ShowAllFacetValuesPage.SELECTED_FACET_PARAM, facetField.getName());
+        pageParameters.add(ShowAllFacetValuesPage.FACET_MIN_OCCURS, "1");
         add(new BookmarkablePageLink("showMore", ShowAllFacetValuesPage.class, pageParameters) {
 
-            public boolean isVisible() {
+            @Override
+                        public boolean isVisible() {
                 return !facetModel.isSelected() && showMore;
             }

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ShowAllFacetValuesPage.html

@@ -11 +11 @@
                 </tr>
             </table>
+            <div class="filter">
+                <a href="#" wicket:id="filter"><span wicket:id="filterLabel">Filter</span></a>
+            </div>
+            <br>
             <div class="message"><wicket:message key="subcategoriesIn">[Subcategories]</wicket:message> <span class="facet" wicket:id="category"></span>:</div>
             <div wicket:id="alphaPanel"></div>

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ShowAllFacetValuesPage.java

@@ -6 +6 @@
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.repeater.RepeatingView;
 
 public class ShowAllFacetValuesPage extends BasePage {
 
-    public static final String SELECTED_FACET_PARAM = "selectedFacet";
+        public static final String SELECTED_FACET_PARAM = "selectedFacet";
+        public static final String FACET_MIN_OCCURS = "facetMinOccurs";
+        public static final Integer FACET_MIN_OCCURS_VALUE = 2; // for parameter FACET_MIN_OCCURS to show only values that occur with this minimal frequency
 
-    public ShowAllFacetValuesPage(PageParameters parameters) {
-        super(parameters);
-        final SearchPageQuery query = new SearchPageQuery(parameters);
+        public ShowAllFacetValuesPage(PageParameters parameters) {
+                super(parameters);
+                final SearchPageQuery query = new SearchPageQuery(parameters);
 
-        Map<String, String> filterQueries = query.getFilterQueryMap();
+                Map<String, String> filterQueries = query.getFilterQueryMap();
 
-        RepeatingView filteredFacets = new RepeatingView("filteredFacets");
-        if (filterQueries != null && !filterQueries.isEmpty()) {
-            WebMarkupContainer wmc = new WebMarkupContainer(filteredFacets.newChildId());
-            wmc.add(new Label("filteredFacet", "Selected categories:"));
-            filteredFacets.add(wmc);
-            for (String fq : filterQueries.keySet()) {
-                wmc = new WebMarkupContainer(filteredFacets.newChildId());
-                wmc.add(new Label("filteredFacet", fq + " = " + filterQueries.get(fq)));
-                filteredFacets.add(wmc);
-            }
-        }
-        add(filteredFacets);
-        String selectedFacet = parameters.getString(SELECTED_FACET_PARAM);
-        add(new Label("category", selectedFacet));
-        SolrFacetFieldDataProvider data = new SolrFacetFieldDataProvider(selectedFacet, query);
-        add(new AlphabeticalPanel("alphaPanel", data, query));
-    }
+                // filter for minimal frequency of values
+                addOccurrencesFilter(parameters);
+                
+                RepeatingView filteredFacets = new RepeatingView("filteredFacets");
+                if (filterQueries != null && !filterQueries.isEmpty()) {
+                        WebMarkupContainer wmc = new WebMarkupContainer(filteredFacets.newChildId());
+                        wmc.add(new Label("filteredFacet", "Selected categories:"));
+                        filteredFacets.add(wmc);
+                        for (String fq : filterQueries.keySet()) {
+                                wmc = new WebMarkupContainer(filteredFacets.newChildId());
+                                wmc.add(new Label("filteredFacet", fq + " = " + filterQueries.get(fq)));
+                                filteredFacets.add(wmc);
+                        }
+                }
+                add(filteredFacets);
+                String selectedFacet = parameters.getString(SELECTED_FACET_PARAM);
+                Integer facetMinOccurs = parameters.getAsInteger(FACET_MIN_OCCURS, 1);
+                add(new Label("category", selectedFacet));
+                SolrFacetFieldDataProvider data = new SolrFacetFieldDataProvider(selectedFacet, query);
+                add(new AlphabeticalPanel("alphaPanel", data, query, facetMinOccurs));
+        }
+        
+        /**
+         * Adds a link to allow filtering for minimal occurrences of a value or to show all values again
+         * @param parameters
+         */
+        private void addOccurrencesFilter(PageParameters parameters) {
+                PageParameters newParameters = (PageParameters) parameters.clone();
+                newParameters.remove(FACET_MIN_OCCURS);
+                if(!parameters.containsKey(FACET_MIN_OCCURS) || parameters.getAsInteger(FACET_MIN_OCCURS) == 1) {
+                        newParameters.add(FACET_MIN_OCCURS, FACET_MIN_OCCURS_VALUE.toString());
+                        add(new BookmarkablePageLink<Void>("filter", ShowAllFacetValuesPage.class, newParameters).add(new Label("filterLabel", "Show only values that occur at least "+FACET_MIN_OCCURS_VALUE+" times")));
+                } else {
+                        add(new BookmarkablePageLink<Void>("filter", ShowAllFacetValuesPage.class, newParameters).add(new Label("filterLabel", "Show all values")));
+                }
+        }
 }