Changeset 13993

Timestamp:

2007-03-28T16:07:48+12:00 (17 years ago)

Author:

qq6

Message:

add language and subcollection parameters to index

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java

@@ -92 +92 @@
 
     protected boolean setUpQueryer(HashMap params) {
-    // set up mgpp_src
-    String indexdir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) + File.separatorChar + GSFile.collectionIndexPath(this.index_stem, this.physical_index_name);
-    this.mgpp_src.loadIndexData(indexdir);
 
     // set up the query params
     Set entries = params.entrySet();
     Iterator i = entries.iterator();
+    String physical_sub_index_name=null;
+    String physical_index_language_name=null;
     while (i.hasNext()) {
         Map.Entry m = (Map.Entry)i.next();
@@ -129 +128 @@
             this.mgpp_src.setSortByRank(false);
         }
+        } else if (name.equals(INDEX_SUBCOLLECTION_PARAM)) {
+        physical_sub_index_name=value;
+        }else if (name.equals(INDEX_LANGUAGE_PARAM)){
+        physical_index_language_name=value;
         } // ignore any others
     }
     
+    if (physical_index_name.equals("idx")){
+        if (physical_sub_index_name!=null) {
+        physical_index_name+=physical_sub_index_name;
+        }   
+        if (physical_index_language_name!=null){
+        physical_index_name+=physical_index_language_name;
+        }
+    }
+
+    // set up mgpp_src
+    String indexdir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) + File.separatorChar + GSFile.collectionIndexPath(this.index_stem, physical_index_name);
+    this.mgpp_src.loadIndexData(indexdir);
+
+    physical_index_name="idx";
     return true;
     }