Changeset 12324 for trunk/indexers

Timestamp:

2006-07-28T12:26:30+12:00 (18 years ago)

Author:

kjdon

Message:

made the wrapper use maxnumeric for query parsing, can set it using setMaxNumeric

Location:

trunk/indexers/mgpp

Files:

• java/org/greenstone/mgpp/MGPPWrapper.java (modified) (1 diff)
• jni/MGPPWrapperImpl.cpp (modified) (3 diffs)
• jni/MGPPWrapperImpl.h (modified) (1 diff)
• jni/org_greenstone_mgpp_MGPPWrapper.h (modified) (1 diff)

trunk/indexers/mgpp/java/org/greenstone/mgpp/MGPPWrapper.java

@@ -86 +86 @@
     public native void setMatchMode(int mode);
 
+    /** sets maxnumeric */
+    public native void setMaxNumeric(int maxnumeric);
     /** returns a string with all the current query param settings */
     public native String getQueryParams();

trunk/indexers/mgpp/jni/MGPPWrapperImpl.cpp

@@ -42 +42 @@
   defaultStemMethod=0;
   defaultBoolCombine=0;
-  
+  maxNumeric = 4;
 }
 
@@ -299 +299 @@
   // parse the query string into a tree structure
   queryTree = ParseQuery(queryArray, data->defaultBoolCombine, 
-             data->defaultStemMethod);
+             data->defaultStemMethod, data->maxNumeric);
   if (queryTree == NULL) {
     // invalid syntax
@@ -408 +408 @@
 
 JNIEXPORT void JNICALL 
+Java_org_greenstone_mgpp_MGPPWrapper_setMaxNumeric (JNIEnv *j_env, 
+                         jobject j_obj, 
+                         jint j_max) {
+  MGPPWrapperData * data = (MGPPWrapperData *)j_env->GetIntField(j_obj, FID_mgpp_data);
+  data->maxNumeric=j_max;
+}
+
+JNIEXPORT void JNICALL 
 Java_org_greenstone_mgpp_MGPPWrapper_setSortByRank (JNIEnv *j_env, 
                             jobject j_obj, 

trunk/indexers/mgpp/jni/MGPPWrapperImpl.h

@@ -8 +8 @@
   int defaultStemMethod;
   int defaultBoolCombine;
+  int maxNumeric;
   UCArray level; // the return level
 

trunk/indexers/mgpp/jni/org_greenstone_mgpp_MGPPWrapper.h

@@ -114 +114 @@
 /*
  * Class:     org_greenstone_mgpp_MGPPWrapper
+ * Method:    setMaxNumeric
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_greenstone_mgpp_MGPPWrapper_setMaxNumeric
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     org_greenstone_mgpp_MGPPWrapper
  * Method:    getQueryParams
  * Signature: ()Ljava/lang/String;