Changeset 9874 for trunk/indexers

Timestamp:

2005-05-16T11:02:50+12:00 (19 years ago)

Author:

kjdon

Message:

merged from branch ant-install-branch: merge 1

Location:

trunk/indexers/mg

Files:

• java/org/greenstone/mg/MGQueryResult.java (modified) (1 diff)
• jni/MGWrapperImpl.c (modified) (3 diffs)
• src/images/WIN32.MAK (modified) (1 diff)
• src/text/win32.mak (modified) (1 diff)
• winMake.bat (modified) (2 diffs)

trunk/indexers/mg/java/org/greenstone/mg/MGQueryResult.java

@@ -53 +53 @@
     }
 
+    public boolean isClear() {
+    return (total_num_docs_ == 0 && docs_.isEmpty() && terms_.isEmpty());
+    }
 
     /** returns the result as a String - useful for printing out results */

trunk/indexers/mg/jni/MGWrapperImpl.c

@@ -315 +315 @@
 
   /* Check that the index was loaded successfully */
-  assert(qd != NULL);
+  if (qd==NULL) {
+    return NULL;
+  }
+  /*assert(qd != NULL);*/
 
   /* Get the document position and length in the text file */
@@ -372 +375 @@
   jthrowable exc;
 
-  /* Make sure an index has been specified */
-  index_path = data->queryInfo->index;
-  assert(index_path != NULL);
-
-  /* Obtain C versions of the two string parameters */
-  base_dir = (*j_env)->GetStringUTFChars(j_env, j_base_dir, NULL);
-  if (base_dir == NULL) {
-    return;
-  }
-  text_path = (*j_env)->GetStringUTFChars(j_env, j_text_path, NULL);
-  if (text_path == NULL) {
-    (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
-    return;
-  }
-
-  /* Load the appropriate index for satisfying this request */
-  qd = loadIndexData((char*) base_dir, (char*) index_path, (char*) text_path);
-
-  /* The C text strings are no longer needed */
-  (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
-  (*j_env)->ReleaseStringUTFChars(j_env, j_text_path, text_path);
-
-  /* Check that the index was loaded successfully */
-  assert(qd != NULL);
-
-  /* Remove anything hanging around from last time */
-  FreeQueryDocs(qd);
-
+  /* First of all, clear the previous result */
   /* The result to write to */
   result_ptr = (*j_env)->GetObjectField(j_env, j_obj, FID_query_result);
@@ -411 +387 @@
     return;
   }
+
+  /* Make sure an index has been specified */
+  index_path = data->queryInfo->index;
+  assert(index_path != NULL);
+
+  /* Obtain C versions of the two string parameters */
+  base_dir = (*j_env)->GetStringUTFChars(j_env, j_base_dir, NULL);
+  if (base_dir == NULL) {
+    return;
+  }
+  text_path = (*j_env)->GetStringUTFChars(j_env, j_text_path, NULL);
+  if (text_path == NULL) {
+    (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+    return;
+  }
+
+  /* Load the appropriate index for satisfying this request */
+  qd = loadIndexData((char*) base_dir, (char*) index_path, (char*) text_path);
+
+  /* The C text strings are no longer needed */
+  (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+  (*j_env)->ReleaseStringUTFChars(j_env, j_text_path, text_path);
+
+  /* Check that the index was loaded successfully */
+  if (qd == NULL) {
+    return;
+  }
+  /*assert(qd != NULL);*/
+
+  /* Remove anything hanging around from last time */
+  FreeQueryDocs(qd);
 
   /* Obtain a C version of the query string */

trunk/indexers/mg/src/images/WIN32.MAK

@@ -156 +156 @@
 
 mostlyclean:
-    rm -f *$o _*.c _*.o *._c *._o core core.*
+    if exist *$o del *$o
+    if exist  _*.c del  _*.c
+    if exist _*.o  del  _*.o 
+    if exist *._c  del *._c
+    if exist *._o  del *._o
+    if exist core  del  core
+    if exist core.* del  core.*
  
 clean: mostlyclean
-    rm -f $(EXEC)
+    if exist *$e del *$e
  
 distclean: clean
-    rm -f ansi2knr
-    rm -f Makefile
- 
+    del ansi2knr
+     
 maintainer-clean: distclean
     @echo "This command is intended only for maintainers to use;"

trunk/indexers/mg/src/text/win32.mak

@@ -237 +237 @@
 clean:
         if exist *$o del *$o 
-    if exist $(EXEC) del $(EXEC)
+    if exist *$e del *$e
         if exist libmgtextin.lib del libmgtextin.lib
         if exist libmgpass.lib del libmgpass.lib

trunk/indexers/mg/winMake.bat

@@ -29 +29 @@
     cd ..\..
 
+    cd java\org\greenstone\mg
+    call winMake.bat %1
+    cd ..\..\..\..
+
     cd jni
     %MAKE% %MAKE_OPTIONS% win32.mak %1
@@ -40 +44 @@
 
 :done
+
+