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

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.

File:

• vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SearchPageQuery.java (modified) (3 diffs)

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]);