Changeset 6456

Timestamp:

08/14/15 12:04:16 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

multi value search for a single facet

Location:

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo

Files:

• pojo/FacetSelection.java (modified) (1 diff)
• pojo/QueryFacetsSelection.java (modified) (3 diffs)
• service/solr/SearchResultsDao.java (modified) (1 diff)
• service/solr/SolrFacetQueryFactory.java (modified) (1 diff)
• service/solr/impl/AbstractSolrQueryFactory.java (modified) (2 diffs)
• service/solr/impl/SearchResultsDaoImpl.java (modified) (3 diffs)
• service/solr/impl/SolrDocumentQueryFactoryImpl.java (modified) (1 diff)
• service/solr/impl/SolrFacetFieldsService.java (modified) (1 diff)
• service/solr/impl/SolrFacetQueryFactoryImpl.java (modified) (1 diff)
• wicket/panels/search/FacetPanel.java (modified) (3 diffs)
• wicket/panels/search/FacetValuesPanel.java (modified) (1 diff)

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java

@@ -77 +77 @@
         return values;
     }
+    
+    public void mergeValues(FacetSelection facetSel){
+        if(facetSel == null || this.equals(facetSel))
+                return;
+        for(String val: facetSel.values){
+                this.values.add(val);                           
+        }
+    }
+    
+    public void removeValues(FacetSelection facetSel){
+        if(facetSel != null && facetSel.values != null){
+                for(String val: facetSel.values){
+                        this.values.remove(val);
+                }
+        }
+    }
+    
 
     public FacetSelection getCopy() {

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/QueryFacetsSelection.java

@@ -33 +33 @@
     private String queryString;
     private final Map<String, FacetSelection> selection;
+    
+    
+    //multi selection for single facet
+    private String excludedFacet = null;    
+    
 
     /**
@@ -116 +121 @@
         } else {
             if (values instanceof Serializable) {
-                selection.put(facet, values);
+                selection.put (facet, values);
             } else {
-                selection.put(facet, values);
+                selection.put (facet, values);
             }
         }
+    }
+    
+    public void addNewFacetValue(String facet, FacetSelection values){
+        FacetSelection curSel = selection.get(facet);
+        if(curSel != null){
+                curSel.mergeValues(values);
+        }else{
+                curSel = values;
+                excludedFacet = facet;
+        }
+        selectValues(facet, curSel);            
+    }
+    
+    public void removeFacetValue(String facet, FacetSelection values){
+        FacetSelection curSel = selection.get(facet);
+        if (curSel != null){
+                curSel.removeValues(values);
+                
+                //if it was the last one, reset the value
+                if(curSel.getValues().isEmpty()){
+                        excludedFacet = null;
+                }
+        }
+        //to remove facet from map if does not have any value
+        selectValues(facet, curSel);
     }
 
@@ -136 +166 @@
     }
 
+        public String getExcludedFacet() {
+                return excludedFacet;
+        }
+
+        public void setExcludedFacet(String excludedFacet) {
+                this.excludedFacet = excludedFacet;
+        }
+    
+    
+
 }

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/SearchResultsDao.java

@@ -33 +33 @@
     List<FacetField> getFacets(SolrQuery query);
     
+    
+    /*
+     * To support multi selection for single facet the idea is to fire another query 
+     * to fetch all values for facet which is the first in the fq parameter
+     * and to merge (replace the list) with filtered
+     * 
+     * another would be to replace the model itself, but where to keep it???
+     */
+    
+    List<FacetField> getFacets(SolrQuery query, SolrQuery completeFacetValList);
+    
 }

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/SolrFacetQueryFactory.java

@@ -46 +46 @@
     SolrQuery createCountFacetsQuery(List<String> facets);
 
+    /* query that returns complete list of values for specified facet */
+        SolrQuery createExludedFacetQuery(QueryFacetsSelection selection, String facet, int valueLimit);
+
 }

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/AbstractSolrQueryFactory.java

@@ -34 +34 @@
     protected static final String SOLR_SEARCH_ALL = null;
 
-    protected final void addQueryFacetParameters(final SolrQuery query, QueryFacetsSelection queryFacetsSelections) {
+    protected final void addQueryFacetParameters(final SolrQuery query, QueryFacetsSelection queryFacetsSelections, boolean includeFilterQueries) {
         final String queryString = queryFacetsSelections.getQuery();
         if (queryString == null) {
@@ -65 +65 @@
                 }
             }
-            query.setFilterQueries(encodedQueries.toArray(new String[encodedQueries.size()]));
+            if(includeFilterQueries)
+                query.setFilterQueries(encodedQueries.toArray(new String[encodedQueries.size()]));
         }
     }

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImpl.java

@@ -7 +7 @@
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.response.FacetField;
+import org.apache.solr.client.solrj.response.FacetField.Count;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocumentList;
@@ -34 +35 @@
         return facetFields;
     }
+    
+    
+    @Override
+    public java.util.List<FacetField> getFacets(SolrQuery query, SolrQuery completeFacetValList) {
+        final QueryResponse response = fireQuery(sanitise(query));
+        
+        final List<FacetField> facetFields = getFacets(query);
+        
+        
+        final QueryResponse completeList = fireQuery(sanitise(completeFacetValList));
+        final FacetField excludedFacet = completeList.getFacetFields().get(0);
+        FacetField newFacet = null;
+        Integer ind = null;
+        
+        for(FacetField facet: facetFields){
+                if(facet.getName().equals(excludedFacet.getName())){
+                        logger.debug("Missing values for excluded Facet {} will be added", facet.getName());
+                        newFacet = copyFacetField(facet);
+                        ind = facetFields.indexOf(facet);
+nextVal:                for(FacetField.Count exVal: excludedFacet.getValues()){
+                                        boolean exists = false;
+                                for(FacetField.Count val: facet.getValues()){
+                                        if(exVal.getName().equals(val.getName())){
+                                                exists = true;
+                                                break;
+                                        }
+                                }
+                                //import missing values into the facet from the list and set count to zero
+                                if(!exists){
+                                        logger.debug("Missing value {} is added with count 0", exVal.getName());
+                                        newFacet.add(exVal.getName(), 0);
+                                }
+                        }
+                }
+        }
+        
+        if(ind != null){
+                facetFields.remove(ind);
+                facetFields.add(ind, newFacet);
+        }
+        
+        return facetFields;
+    }
+    
+    private FacetField copyFacetField(FacetField from){
+        FacetField newFacet = new FacetField(from.getName(), from.getGap(), from.getEnd());
+        for(FacetField.Count val: from.getValues())
+                newFacet.add(val.getName(), val.getCount());
+        
+        return newFacet;
+    }
+    
 
     @Override
@@ -42 +95 @@
         return documents;
     }
-
+    
 }

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImpl.java

@@ -51 +51 @@
         final SolrQuery query = getDefaultDocumentQuery();
         // apply selection
-        addQueryFacetParameters(query, selection);
+        addQueryFacetParameters(query, selection, true);
         // set offset and limit
         query.setStart(first);

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetFieldsService.java

@@ -47 +47 @@
     @Override
     public List<FacetField> getFacetFields(QueryFacetsSelection selection, List<String> facets, int valueLimit) {
-        return searchResultsDao.getFacets(queryFatory.createFacetQuery(selection, facets, valueLimit));
+        return (selection.getExcludedFacet() == null)?
+        searchResultsDao.getFacets(queryFatory.createFacetQuery(selection, facets, valueLimit)) :
+        searchResultsDao.getFacets(queryFatory.createFacetQuery(selection, facets, valueLimit), 
+                        queryFatory.createExludedFacetQuery(selection, selection.getExcludedFacet(), valueLimit));
     }
 

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImpl.java

@@ -46 +46 @@
     public SolrQuery createFacetQuery(QueryFacetsSelection queryFacetsSelections, List<String> facets, int facetValueLimit) {
         final SolrQuery query = getBaseQuery(facets);
-        addQueryFacetParameters(query, queryFacetsSelections);
+        addQueryFacetParameters(query, queryFacetsSelections, true);
         query.setFacetLimit(facetValueLimit);
         return query;
     }
+    
+    @Override
+        public SolrQuery createExludedFacetQuery(QueryFacetsSelection queryFacetsSelections, String facet, int facetValueLimit) {
+        SolrQuery query = baseQuery.getCopy();
+        query.addFacetField(facet);
+        addQueryFacetParameters(query, queryFacetsSelections, false);
+        query.setFacetLimit(facetValueLimit);
+        return query;
+        }
+    
+    
 
     @Override

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetPanel.java

@@ -81 +81 @@
 
         final boolean valuesSelected = !getModelObject().getFacetValues().isEmpty();
-        //show both for multi values
-        facetValuesPanel.setVisible(!valuesSelected); 
+        facetValuesPanel.setVisible(true); 
         selectedFacetPanel.setVisible(valuesSelected);
 
@@ -105 +104 @@
                     public void onValuesSelected(String facet, FacetSelection value, AjaxRequestTarget target) {
                         // A value has been selected on this facet's panel, update the model!
-                        FacetPanel.this.getModelObject().getSelection().selectValues(facet, value);
+                        FacetPanel.this.getModelObject().getSelection().addNewFacetValue(facet, value);
+                        //FacetPanel.this.getModelObject().getSelection().selectValues(facet, value);
                         if (target != null) {
                             // reload entire page for now
@@ -121 +121 @@
 
                 // Values have been removed, calculate remainder
+                
                 final FacetSelection facetSelection = selection.getSelectionValues(facet);
-                final Collection<String> currentSelection = facetSelection.getValues();
-                final Collection<String> newSelection = new HashSet<String>(currentSelection);
-                newSelection.removeAll(valuesRemoved);
+//                final Collection<String> currentSelection = facetSelection.getValues();
+//                final Collection<String> newSelection = new HashSet<String>(currentSelection);
+//                newSelection.removeAll(valuesRemoved);
 
                 // Update model (keep selection type)
-                selection.selectValues(facet, new FacetSelection(facetSelection.getSelectionType(), newSelection));
+//                              selection.selectValues(facet, new FacetSelection(facetSelection.getSelectionType(), newSelection));
+                
+                FacetSelection fSelToRemove = new FacetSelection(facetSelection.getSelectionType(), valuesRemoved);
+                selection.removeFacetValue(facet, fSelToRemove);
 
                 // collapse after removal

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java

@@ -73 +73 @@
     private final int subListSize;
     private final IModel<String> fieldNameModel;
-
+    
     @SpringBean
     private FieldValueConverterProvider fieldValueConverterProvider;