Changeset 29555 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/URLFilter.java

Timestamp:

2014-12-08T14:38:47+13:00 (9 years ago)

Author:

kjdon

Message:

removed hard coded search parameters - it should just use service defaults

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/URLFilter.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/URLFilter.java

@@ -251 +251 @@
                         additionalParameters = new String[] { GSParams.ACTION };
                         defaultParamValues = new String[] { "d" };
-                        //additionalParameters = new String[] { GSParams.ACTION, GSParams.DOCUMENT_TYPE };
-                        //defaultParamValues = new String[] { "d", "hierarchy" };
                     }
                     //PAGE
@@ -370 +368 @@
                             if (serviceName.equals("TextQuery") || serviceName.equals("RawQuery"))
                             {
-                                additionalParameters = new String[] { GSParams.ACTION, GSParams.SUBACTION, GSParams.REQUEST_TYPE, "s1.maxDocs", "s1.hitsPerPage", "s1.level", "s1.sortBy", "s1.index", "s1.startPage" };
-                                defaultParamValues = new String[] { "q", "", "rd", "100", "20", "Sec", "rank", "ZZ", "1" };
 
                                 gRequest.setParameter("s1.query", segments[i + 2]);
@@ -377 +373 @@
                             else if (serviceName.equals("FieldQuery"))
                             {
-                                additionalParameters = new String[] { GSParams.ACTION, GSParams.SUBACTION, GSParams.REQUEST_TYPE, "s1.maxDocs", "s1.hitsPerPage", "s1.level", "s1.sortBy", "s1.fqf", "s1.startPage" };
-                                defaultParamValues = new String[] { "q", "", "rd", "100", "20", "Sec", "rank", "ZZ", "1" };
-
                                 gRequest.setParameter("s1.fqv", segments[i + 2]);
                             }
                             else if (serviceName.equals("AdvancedFieldQuery"))
                             {
-                                additionalParameters = new String[] { GSParams.ACTION, GSParams.SUBACTION, GSParams.REQUEST_TYPE, "s1.maxDocs", "s1.hitsPerPage", "s1.level", "s1.sortBy", "s1.fqf", "s1.fqk", "s1.startPage" };
-                                defaultParamValues = new String[] { "q", "", "rd", "100", "20", "Sec", "rank", "ZZ", "0", "1" };
-
                                 gRequest.setParameter("s1.fqv", segments[i + 2]);
                             }