Changeset 4522

Timestamp:

02/14/14 14:07:04 (10 years ago)

Author:

twagoo

Message:

Included values in facet panel

Location:

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

Files:

• components/FacetPanel.html (modified) (1 diff)
• components/FacetPanel.java (modified) (2 diffs)
• components/FacetsPanel.java (modified) (1 diff)
• pages/FacetedSearchPage.java (modified) (1 diff)
• provider (added)
• provider/FacetFieldValuesProvider.java (added)
• provider/FacetFieldsDataProvider.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/FacetFieldsDataProvider.java) (1 diff)

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

@@ -33 +33 @@
             </form>
             <div class="sbilinks facetvalues">
-<!--                <ul>
-                    <li wicket:id="facetValues"><a wicket:id="facetSelect" href="index3.html">Dutch (148167)</a></li>
-                    <li class="more-link"><a wicket:id="allFacetValuesLink" href="#">more...</a></li>
-                </ul>-->
+                <ul>
+                    <li wicket:id="facetValues"><a wicket:id="facetSelect" href="index3.html"><span wicket:id="name">Dutch</span> (<span wicket:id="count">148167</span>)</a></li>
+                    <!--<li class="more-link"><a wicket:id="allFacetValuesLink" href="#">more...</a></li>-->
+                </ul>
             </div>
         </div>

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.components;
 
+import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldValuesProvider;
 import org.apache.solr.client.solrj.response.FacetField;
+import org.apache.solr.client.solrj.response.FacetField.Count;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
@@ -30 +35 @@
 public class FacetPanel extends Panel {
 
+    private final int maxNumberOfFacetsToShow = 10; //TODO: get from config
+    
     public FacetPanel(String id, IModel<FacetField> model) {
         super(id, model);
         setDefaultModel(new CompoundPropertyModel<FacetField>(model));
 
+        // 'name' field from FacetField
         add(new Label("name"));
+        
+        // provider that extracts values and counts from FacetField
+        final FacetFieldValuesProvider valuesProvider = new FacetFieldValuesProvider(model, maxNumberOfFacetsToShow);
+        add(new DataView<Count>("facetValues", valuesProvider) {
+
+            @Override
+            protected void populateItem(Item<Count> item) {
+                item.setDefaultModel(new CompoundPropertyModel<Count>(item.getModel()));
+                final Link selectLink = new Link("facetSelect") {
+                    
+                    @Override
+                    public void onClick() {
+                        //TODO: select facet
+                        throw new UnsupportedOperationException("Not supported yet.");
+                    }
+                };
+                item.add(selectLink);
+                // 'name' field from Count (name of value)
+                selectLink.add(new Label("name"));
+                // 'count' field from Count (document count for value)
+                selectLink.add(new Label("count"));
+            }
+        });
     }
 

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

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
-import eu.clarin.cmdi.vlo.service.impl.FacetFieldsDataProvider;
+import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldsDataProvider;
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.markup.html.panel.Panel;

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

@@ -25 +25 @@
                 new HashMap<String, Collection<String>>() {
                     {
-                        put("language", Collections.singleton("Dutch"));
+//                        put("language", Collections.singleton("Dutch"));
                         put("continent", Collections.<String>emptyList());
                     }

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

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.service.impl;
+package eu.clarin.cmdi.vlo.wicket.provider;
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;