Changeset 4212 for trunk/indexers/mgpp

Timestamp:

2003-05-01T12:02:40+12:00 (21 years ago)

Author:

kjdon

Message:

mgpp parseQuery returns NULL if theres been a syntax error, the jni stuff sets a syntaxError variable in MGPPQueryResult to true. also fixed some stuff left over from teh basedir change in teh cpp code

File:

• trunk/indexers/mgpp/jni/MGPPWrapperImpl.cpp (modified) (5 diffs)

trunk/indexers/mgpp/jni/MGPPWrapperImpl.cpp

@@ -60 +60 @@
 jmethodID MID_setTotalDocs=NULL; // MGPPQueryResult.setTotalDocs()
 jmethodID MID_clearResult=NULL; //MGPPQueryResult.clear()
+jmethodID MID_setSyntaxError=NULL; // MGPPQueryResult.setSyntaxError()
 jclass CID_String=NULL; // class ID of String
 
@@ -108 +109 @@
   if (MID_clearResult==NULL) {
       cerr <<"method clear not found"<<endl;
+  }
+  MID_setSyntaxError = j_env->GetMethodID(JC_MGPPQueryResult, "setSyntaxError", "(Z)V");
+  if (MID_clearResult==NULL) {
+      cerr <<"method setSyntaxError not found"<<endl;
   }
 
@@ -151 +156 @@
 JNIEXPORT jstring JNICALL 
 Java_org_greenstone_mgpp_MGPPWrapper_getDocument (JNIEnv *j_env, 
- jobject j_obj, jstring j_base_dir, 
- jstring j_text_name, jstring j_level, jlong j_docnum) {
+ jobject j_obj, jstring j_text_name, jstring j_level, jlong j_docnum) {
   
 #ifdef __WIN32__
@@ -213 +217 @@
  */
 JNIEXPORT jboolean JNICALL 
-Java_org_greenstone_mgpp_MGPPWrapper_loadIndexData (JNIEnv *j_env, jobject j_obj, jstring j_base_dir, jstring j_index_name) {
+Java_org_greenstone_mgpp_MGPPWrapper_loadIndexData (JNIEnv *j_env, jobject j_obj,  jstring j_index_name) {
 
   jint data_ptr = j_env->GetIntField(j_obj, FID_mgpp_data);
@@ -295 +299 @@
   queryTree = ParseQuery(queryArray, data->defaultBoolCombine, 
              data->defaultStemMethod);
+  if (queryTree == NULL) {
+    // invalid syntax
+    j_env->CallVoidMethod(result_ptr, MID_setSyntaxError, true);
+    cerr << "MGPPWrapperImpl: invalid query syntax!!\n";
+    return; 
+  }
   // print the query
   PrintNode (cout, queryTree);