Changeset 32105 for gs3-extensions/solr

Timestamp:

2018-01-16T21:47:46+13:00 (6 years ago)

Author:

Georgiy Litvinov

Message:

Added docFilter query param for limiting results to document's sections.

Location:

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3

Files:

• service/GS2SolrSearch.java (modified) (2 diffs)
• util/SolrQueryWrapper.java (modified) (4 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java

@@ -251 +251 @@
         String physical_index_language_name = null;
         String physical_sub_index_name = null;
+        String docFilter = null;
         int maxdocs = 100;
         int hits_per_page = 20;
@@ -339 +340 @@
                 physical_index_language_name = value;
             } // ignore any others
+            else if (name.equals("docFilter"))
+            {
+                docFilter = value;
+                docFilter = docFilter.replaceAll("[^A-Za-z0-9.]", "");
+                    this.solr_src.setDocFilter(value);
+            }
         }
         // set up start and end results if necessary

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java

@@ -73 +73 @@
     protected int max_docs = 100;
     protected String sort_order = SORT_DESCENDING;
+    //Filter results by document hash. To get results from limited document sections.
+    protected String docFilter = null;
   protected String sort_field = SORT_BY_RANK; // don't want null default for solr
     protected ArrayList<String> _facets = new ArrayList<String>();
@@ -115 +117 @@
   {
     this.sort_order = order;
+  }
+  public void setDocFilter(String docFilter)
+  {
+    this.docFilter = docFilter;
   }
     public void addFacet(String facet)
@@ -356 +362 @@
         //TI:farming
         //docOID,score,termfreq(TI,'farming'),totaltermfreq(TI,'farming')
-
+        
 
         // which fields to return for each document, we'll add the request for totaltermfreq later
@@ -371 +377 @@
         solrQuery.setParam("hl.tag.post","&lt;/span&gt;" );
         
+        if (docFilter != null) {
+            solrQuery.setParam("fq", "docOID:" + docFilter + "*");
+        }
         //solrQuery.setTerms(true); // turn on the termsComponent       
         //solrQuery.set("terms.fl", "ZZ"); // which field to get the terms from. ModifiableSolrParams method