Changeset 4201

Timestamp:

12/18/13 12:38:15 (10 years ago)

Author:

keeloo

Message:

After splitting of a branch (r4199) including code for moving from wicket 1.4 to wicket 6, some more modifications in the direction of that target.

Location:

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo

Files:

• Theme.java (added)
• VloPageParameters.java (added)
• VloSession.java (added)
• pages/FacetedSearchPage.java (modified) (1 diff)
• pages/SearchPageQuery.java (modified) (3 diffs)
• pages/SearchServiceDataProvider.java (modified) (1 diff)
• pages/ShowAllFacetValuesPage.java (modified) (2 diffs)

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java

@@ -271 +271 @@
                 int offset = 0;
                 int fetchSize = 1000;
-                int totalResults = dataProvider.size();
+                int totalResults = (int) dataProvider.size();
                 while (offset < totalResults) {
                     Iterator<SolrDocument> iter = dataProvider.iterator(offset, fetchSize);

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SearchPageQuery.java

@@ -4 +4 @@
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -27 +28 @@
         query = getDefaultQuery();
         
-        StringValue paramVal;
-        paramVal = parameters.get(CommonParams.Q);
-        String queryParam = paramVal.toString();
+        String queryParam = parameters.get(CommonParams.Q).toString();
 
         setSearchQuery(queryParam);
@@ -38 +37 @@
 
         }
-        String[] filterQueries = parameters.getStringArray(CommonParams.FQ);
-        if (filterQueries != null) {
-            String[] encodedQueries = new String[filterQueries.length];
-            for (int i = 0; i < filterQueries.length; i++) {
-                String fq = filterQueries[i];
+        
+        List<StringValue> filterQueryValues = parameters.getValues(CommonParams.FQ);
+        
+        if (filterQueryValues != null) {
+            String[] encodedQueries = new String[filterQueryValues.size()];
+            
+            for (int i = 0; i < filterQueryValues.size(); i++) {
+                String fq = filterQueryValues.get(i).toString();
                 String[] keyValue = fq.split(":", 2);
                 filterQueryMap.put(keyValue[0], keyValue[1]);

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SearchServiceDataProvider.java

@@ -17 +17 @@
 
 /**
- * Data provider of all documents with SearchService entry (FCS) based on existing SolrQuery
- * 
+ * Data provider of all documents with SearchService entry (FCS) based on
+ * existing SolrQuery
+ *
  * @author Thomas Eckart
  *
  */
-public class SearchServiceDataProvider extends SortableDataProvider<SolrDocument> {
-        private final static Logger LOG = LoggerFactory.getLogger(SearchServiceDataProvider.class);
-        
-        private static final long serialVersionUID = -5355607690141772113L;
-        private final SolrQuery query;
-        private SolrDocumentList docList;
+public class SearchServiceDataProvider extends SortableDataProvider<SolrDocument, String> {
 
-        public SearchServiceDataProvider(SolrQuery query) {
-                this.query = query;
-                this.query.setFacet(false);
-                this.query.setStart(0);
-                this.query.setRows(10);
-                this.query.setFields(FacetConstants.FIELD_SEARCH_SERVICE, FacetConstants.FIELD_ID);
-                this.query.setQuery(query.getQuery());
-                this.query.addFilterQuery(FacetConstants.FIELD_SEARCH_SERVICE + ":*");
-                LOG.debug("Used query for search services: "+this.query.toString());
-        }
+    private final static Logger LOG = LoggerFactory.getLogger(SearchServiceDataProvider.class);
+    private static final long serialVersionUID = -5355607690141772113L;
+    private final SolrQuery query;
+    private SolrDocumentList docList;
 
-        private SearchResultsDao getSearchResultsDao() {
-                return DaoLocator.getSearchResultsDao();
-        }
+    public SearchServiceDataProvider(SolrQuery query) {
+        this.query = query;
+        this.query.setFacet(false);
+        this.query.setStart(0);
+        this.query.setRows(10);
+        this.query.setFields(FacetConstants.FIELD_SEARCH_SERVICE, FacetConstants.FIELD_ID);
+        this.query.setQuery(query.getQuery());
+        this.query.addFilterQuery(FacetConstants.FIELD_SEARCH_SERVICE + ":*");
+        LOG.debug("Used query for search services: " + this.query.toString());
+    }
 
-        private SolrDocumentList getDocList() {
-                if (docList == null) {
-                        docList = getSearchResultsDao().getResults(query);
-                }
-                return docList;
-        }
+    private SearchResultsDao getSearchResultsDao() {
+        return DaoLocator.getSearchResultsDao();
+    }
 
-        @Override
-        public Iterator<SolrDocument> iterator(int first, int count) {
-                if (first != query.getStart().intValue() || count != query.getRows().intValue()) {
-                        query.setStart(first).setRows(count);
-                        docList = null;
-                }
-                return getDocList().iterator();
-        }
-        
-        public Iterator<SolrDocument> iterator() {
-                return getDocList().iterator();
-        }
+    private SolrDocumentList getDocList() {
+        if (docList == null) {
+            docList = getSearchResultsDao().getResults(query);
+        }
+        return docList;
+    }
 
-        @Override
-        public IModel<SolrDocument> model(SolrDocument solrDocument) {
-                return new Model<SolrDocument>(solrDocument);
-        }
+    @Override
+    public Iterator<SolrDocument> iterator(long first, long count) {
+        if (first != query.getStart().intValue() || count != query.getRows().intValue()) {
+            query.setStart((int) first).setRows((int) count);
+            docList = null;
+        }
+        return getDocList().iterator();
+    }
 
-        @Override
-        public int size() {
-                return (int) getDocList().getNumFound();
-        }
+    public Iterator<SolrDocument> iterator() {
+        return getDocList().iterator();
+    }
+
+    @Override
+    public IModel<SolrDocument> model(SolrDocument solrDocument) {
+        return new Model<SolrDocument>(solrDocument);
+    }
+
+    @Override
+    public long size() {
+        return getDocList().getNumFound();
+    }
 }

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowAllFacetValuesPage.java

@@ -3 +3 @@
 import java.util.Map;
 
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -25 +25 @@
                 addOccurrencesFilter(parameters);
                 
-                String selectedFacet = parameters.getString(SELECTED_FACET_PARAM);
-                Integer facetMinOccurs = parameters.getAsInteger(FACET_MIN_OCCURS, 1);
+                String selectedFacet = (parameters.get(SELECTED_FACET_PARAM)).toString();
+                
+                Integer facetMinOccurs = (parameters.get(FACET_MIN_OCCURS)).toInt(1); // take care of 1 as default value
+                
                 add(new Label("category", selectedFacet));
                 SolrFacetFieldDataProvider data = new SolrFacetFieldDataProvider(selectedFacet, query);