Changeset 29409

Timestamp:

2014-11-03T12:26:30+13:00 (9 years ago)

Author:

kjdon

Message:

adding a reset method to MGPPSearchWrapper. When we rebuild a collection, we are unloading then reloading the index data, however the default settings (stem method etc) were not being reset. This led to a problem: If a collection was built with accent folding on, and a query wsa done with accent folding on, then this was stored in defaultStemMethod. If the collection was then built without accent folding on, the accent folding setting wouldn't be unset and forever after, the stemMethod would be wrong and therefore no stem/casefold could be done. Now we can call reset after unloading the indexdata to get all the settings back to defaults.

Location:

main/trunk

Files:

• greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/MGPPSearchWrapper.java (modified) (1 diff)
• greenstone2/common-src/indexers/mgpp/jni/MGPPSearchWrapperImpl.cpp (modified) (3 diffs)
• greenstone2/common-src/indexers/mgpp/jni/MGPPSearchWrapperImpl.h (modified) (1 diff)
• greenstone2/common-src/indexers/mgpp/jni/org_greenstone_mgpp_MGPPSearchWrapper.h (modified) (1 diff)
• greenstone3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/MGPPSearchWrapper.java

@@ -84 +84 @@
     public native boolean unloadIndexData();
 
+  /** reset all the params back to their defaults */
+  public native void reset();
     // query param methods
 

main/trunk/greenstone2/common-src/indexers/mgpp/jni/MGPPSearchWrapperImpl.cpp

@@ -67 +67 @@
   }
 
+  resetDefaults();
+}
+
+MGPPSearchData::~MGPPSearchData() { 
+  if (indexData !=NULL) {
+    delete indexData;
+  }
+  if (queryInfo !=NULL) {
+    delete queryInfo;
+  }
+}
+
+void MGPPSearchData::resetDefaults() {
   // set all the default params
   SetCStr(queryInfo->docLevel, "Document"); // the level to search at
@@ -80 +93 @@
   defaultBoolCombine=0;
   maxNumeric = 4;
-}
-
-MGPPSearchData::~MGPPSearchData() { 
-  if (indexData !=NULL) {
-    delete indexData;
-  }
-  if (queryInfo !=NULL) {
-    delete queryInfo;
-  }
+
 }
 
@@ -270 +275 @@
 }
 
+/* reset the stored settings 
+*/
+JNIEXPORT void JNICALL 
+Java_org_greenstone_mgpp_MGPPSearchWrapper_reset (JNIEnv *j_env, jobject j_obj) {
+
+  jlong data_ptr = j_env->GetLongField(j_obj, FID_mgpp_data);
+  MGPPSearchData * data = (MGPPSearchData *)data_ptr;
+  data->resetDefaults();
+  
+
+}
 /* do the actual query - the results are written to query_result held on the 
    java side */

main/trunk/greenstone2/common-src/indexers/mgpp/jni/MGPPSearchWrapperImpl.h

@@ -33 +33 @@
   ~MGPPSearchData();
 
+  void resetDefaults(); // reset the defaults
 };

main/trunk/greenstone2/common-src/indexers/mgpp/jni/org_greenstone_mgpp_MGPPSearchWrapper.h

@@ -38 +38 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_greenstone_mgpp_MGPPSearchWrapper_unloadIndexData
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_greenstone_mgpp_MGPPSearchWrapper
+ * Method:    reset
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_greenstone_mgpp_MGPPSearchWrapper_reset
   (JNIEnv *, jobject);
 

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

@@ -63 +63 @@
         super.cleanUp();
         mgpp_src.unloadIndexData();
+        mgpp_src.reset(); // reset stored settings to defaults
     }