Changeset 4579

Timestamp:

02/25/14 16:33:17 (10 years ago)

Author:

twagoo

Message:

Added single facet panel for collection selection

Location:

vlo/branches/vlo-3.0/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (4 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/components/AbstractFacetsPanel.java (added)
• main/java/eu/clarin/cmdi/vlo/wicket/components/FacetsPanel.java (modified) (3 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultsPanel.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/components/SingleFacetPanel.html (copied) (copied from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FacetsPanel.html) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/components/SingleFacetPanel.java (added)
• main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.html (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java (modified) (2 diffs)
• test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java (modified) (5 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -28 +28 @@
 import eu.clarin.cmdi.vlo.service.impl.SolrFacetQueryFactoryImpl;
 import java.io.IOException;
+import java.util.Collections;
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
@@ -46 +47 @@
 public class VloSpringConfig {
 
+    public final static String FACETS_PANEL_SERVICE = "factsPanelService";
+    public final static String COLLECTION_FACET_SERVICE = "factsPanelService";
+    
     /**
      *
@@ -69 +73 @@
     }
 
-    @Bean
+    @Bean(name = FACETS_PANEL_SERVICE)
     public FacetFieldsService facetFieldsService() {
         return new SolrFacetFieldsService(searchResultsDao(), facetQueryFactory());
+    }
+
+    @Bean
+    public SolrFacetQueryFactory facetQueryFactory() {
+        return new SolrFacetQueryFactoryImpl(vloConfig().getFacetFields());
+    }
+
+    @Bean(name = COLLECTION_FACET_SERVICE)
+    public FacetFieldsService collectionFacetFieldsService() {
+        return new SolrFacetFieldsService(searchResultsDao(), collectionFacetQueryFactory());
+    }
+    
+    @Bean
+    public SolrFacetQueryFactory collectionFacetQueryFactory() {
+        return new SolrFacetQueryFactoryImpl(Collections.singletonList("collection"));
     }
     
@@ -82 +101 @@
     public SearchResultsDao searchResultsDao() {
         return new SearchResultsDaoImpl(solrServer(), vloConfig());
-    }
-
-    @Bean
-    public SolrFacetQueryFactory facetQueryFactory() {
-        return new SolrFacetQueryFactoryImpl(vloConfig().getFacetFields());
     }
     

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.components;
 
-import eu.clarin.cmdi.vlo.wicket.model.FacetSelectionModel;
+import eu.clarin.cmdi.vlo.config.VloSpringConfig;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
 import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldsDataProvider;
 import java.util.Collection;
-import java.util.HashSet;
 import org.apache.solr.client.solrj.response.FacetField;
-import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.markup.repeater.Item;
@@ -42 +40 @@
  * @author twagoo
  */
-public class FacetsPanel extends Panel {
+public class FacetsPanel extends AbstractFacetsPanel {
 
-    @SpringBean
+    @SpringBean(name = VloSpringConfig.FACETS_PANEL_SERVICE)
     private FacetFieldsService facetFieldsService;
-    private final IModel<QueryFacetsSelection> model;
 
     public FacetsPanel(final String id, IModel<QueryFacetsSelection> model) {
         super(id, model);
-        this.model = model;
 
         add(new DataView<FacetField>("facets", new FacetFieldsDataProvider(facetFieldsService, model)) {
@@ -56 +52 @@
             @Override
             protected void populateItem(Item<FacetField> item) {
-                createFacetPanel("facet", item);
+                item.add(createFacetPanel("facet", item.getModel()));
             }
         });
     }
 
-    private void createFacetPanel(String id, Item<FacetField> item) {
+    private Panel createFacetPanel(String id, IModel<FacetField> facetFieldModel) {
         // Is there a selection for this facet?
-        final IModel<FacetField> facetFieldModel = item.getModel();
         final String facetName = facetFieldModel.getObject().getName();
         final Collection<String> selectionValues = model.getObject().getSelectionValues(facetName);
-
         // Show different panel, depending on selected values
         if (selectionValues == null || selectionValues.isEmpty()) {
             // No values selected, show value selection panel
-            item.add(createFacetValuesPanel(id, facetFieldModel));
+            return createFacetValuesPanel(id, facetFieldModel);
         } else {
             // Values selected, show selected values panel (with option to remove)
-            item.add(createSelectedFacetPanel(id, facetName));
+            return createSelectedFacetPanel(id, facetName);
         }
     }
-
-    private FacetValuesPanel createFacetValuesPanel(String id, final IModel<FacetField> facetFieldModel) {
-        return new FacetValuesPanel(id, facetFieldModel) {
-
-            @Override
-            public void onValuesSelected(String facet, Collection<String> value, AjaxRequestTarget target) {
-                // A value has been selected on this facet's panel,
-                // update the model!
-                model.getObject().selectValues(facet, value);
-
-                if (target != null) {
-                    // reload entire page for now
-                    target.add(getPage());
-                }
-            }
-        };
-    }
-
-    private SelectedFacetPanel createSelectedFacetPanel(String id, String facetName) {
-        return new SelectedFacetPanel(id, new FacetSelectionModel(facetName, model)) {
-
-            @Override
-            public void onValuesUnselected(String facet, Collection<String> valuesRemoved, AjaxRequestTarget target) {
-                // Values have been removed, calculate remainder
-                final Collection<String> currentSelection = model.getObject().getSelectionValues(facet);
-                final Collection<String> newSelection = new HashSet<String>(currentSelection);
-                newSelection.removeAll(valuesRemoved);
-
-                // Update model
-                model.getObject().selectValues(facet, newSelection);
-
-                if (target != null) {
-                    // reload entire page for now
-                    target.add(getPage());
-                }
-            }
-        };
-    }
 }

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.components;
 
-import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.SolrDocumentService;
-import eu.clarin.cmdi.vlo.wicket.model.NullFallbackModel;
-import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
 import eu.clarin.cmdi.vlo.wicket.provider.SolrDocumentProvider;
 import java.util.Arrays;
@@ -93 +90 @@
     @Override
     protected void onConfigure() {
+        super.onConfigure();
+        
         // only show pagination navigators if there's more than one page
         final boolean showPaging = resultsView.getPageCount() > 1;

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

@@ -24 +24 @@
     <body>
         <wicket:panel>
-            <div class="sidebaritem">
-                <!-- rounded corners - top **** -->
-                <div class="rtop"><div class="r1"></div><div class="r2"></div><div class="r3"></div><div class="r4"></div></div>
-                <h1>Narrow down</h1>
-                <p>
-                    Use the categories below to limit the search results to those matching the selected value(s).
-                </p>
-                <wicket:container wicket:id="facets">
-                    <div wicket:id="facet">[facet]</div>
-                </wicket:container>
-                <!-- rounded corners - bottom **** -->
-                <div class="rbottom"><div class="r4"></div><div class="r3"></div><div class="r2"></div><div class="r1"></div></div>
-            </div>
+            <wicket:container wicket:id="facetValues" />
+            <wicket:container wicket:id="facetSelection" />
         </wicket:panel>
     </body>

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

@@ -62 +62 @@
             </div>
 
-            <div class="topbar facet collapsedfacet" id="collections">
+            <div wicket:id="collectionsFacet">[COLLECTIONS]</div>
+            
+<!--            <div class="topbar facet collapsedfacet" id="collections">
                 <div class="rtop"><div class="r1"></div><div class="r2"></div><div class="r3"></div><div class="r4"></div></div>
                 <a href="#" class="expandfacet"><span>expand</span></a>
@@ -90 +92 @@
                     </ul>
                 </div>
-                <!-- rounded corners - bottom **** -->
+                 rounded corners - bottom **** 
                 <div class="rbottom"><div class="r4"></div><div class="r3"></div><div class="r2"></div><div class="r1"></div></div>
-            </div>
+            </div>-->
 
             <div class="content">

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

@@ -3 +3 @@
 import eu.clarin.cmdi.vlo.wicket.components.FacetsPanel;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.wicket.components.SingleFacetPanel;
 import eu.clarin.cmdi.vlo.wicket.components.SearchForm;
 import eu.clarin.cmdi.vlo.wicket.components.SearchResultsPanel;
@@ -26 +27 @@
         final Model<QueryFacetsSelection> queryModel = new Model<QueryFacetsSelection>(selection);
 
+        add(new SingleFacetPanel("collectionsFacet", queryModel));
+        
         add(new FacetsPanel("facets", queryModel));
 

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java

@@ -3 +3 @@
 import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
 import eu.clarin.cmdi.vlo.VloWicketApplication;
+import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.config.VloSpringConfig;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -27 +28 @@
 
 import static org.hamcrest.core.AnyOf.*;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 /**
@@ -48 +50 @@
 
         @Override
+        @Bean(name = VloSpringConfig.FACETS_PANEL_SERVICE)
         public FacetFieldsService facetFieldsService() {
-            return mockery().mock(FacetFieldsService.class);
+            return mockery().mock(FacetFieldsService.class, "facetFieldsService");
+        }
+
+        @Override
+        @Bean(name = COLLECTION_FACET_SERVICE)
+        public FacetFieldsService collectionFacetFieldsService() {
+            return mockery().mock(FacetFieldsService.class, "collectionFacetFieldsService");
         }
 
@@ -59 +68 @@
 
     private WicketTester tester;
-    @Autowired
+    @Autowired(required = true)
     private VloWicketApplication application;
-    @Autowired
+    @Autowired(required = true)
     private Mockery mockery;
-    @Autowired
+
+    @Autowired(required = true)
+    @Qualifier(VloSpringConfig.FACETS_PANEL_SERVICE)
     private FacetFieldsService facetFieldsService;
-    @Autowired
+
+    @Autowired(required = true)
+    @Qualifier(VloSpringConfig.COLLECTION_FACET_SERVICE)
+    private FacetFieldsService collectionsFacetFieldsService; //TODO: Make sure this gets injected separately (like qualifier should ensure)
+
+    @Autowired(required = true)
     private SolrDocumentService documentService;
 
@@ -81 +97 @@
                 atLeast(1).of(facetFieldsService).getFacetFieldCount();
                 will(returnValue(2L));
-                oneOf(facetFieldsService).getFacetFields(with(any(QueryFacetsSelection.class)));
+                atLeast(1).of(facetFieldsService).getFacetFields(with(any(QueryFacetsSelection.class)));
                 will(returnValue(Arrays.asList(new FacetField("language"), new FacetField("resource class"))));
-                
+//
+//                // mock collection facet
+//                atLeast(1).of(collectionsFacetFieldsService).getFacetFieldCount();
+//                will(returnValue(1L));
+//                oneOf(collectionsFacetFieldsService).getFacetFields(with(any(QueryFacetsSelection.class)));
+//                will(returnValue(Arrays.asList(new FacetField("collection"))));
+
                 // mock search results
                 atLeast(1).of(documentService).getDocumentCount(with(any(QueryFacetsSelection.class)));