Changeset 9987 for trunk/indexers/mg

Timestamp:

2005-05-31T09:41:19+12:00 (19 years ago)

Author:

kjdon

Message:

added in an exitValue/get_exit_value method to the MGPassesWrapper

Location:

trunk/indexers/mg

Files:

• java/org/greenstone/mg/MGPassesWrapper.java (modified) (1 diff)
• jni/MGPassesWrapperImpl.c (modified) (1 diff)
• jni/org_greenstone_mg_MGPassesWrapper.h (modified) (1 diff)
• src/text/mg_passes_4jni.c (modified) (6 diffs)

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

@@ -138 +138 @@
     public native boolean finish();
 
+    /** get the exit value once finished */
+    public native int exitValue();
  
     /** initialises field and method IDs for java side to enable access on C side */

trunk/indexers/mg/jni/MGPassesWrapperImpl.c

@@ -234 +234 @@
 }
 
-
+/** get the exit value once finished */
+JNIEXPORT jint JNICALL 
+Java_org_greenstone_mg_MGPassesWrapper_exitValue(JNIEnv *j_env, 
+                        jobject j_obj) {
+
+  return get_exit_value();
+}
+

trunk/indexers/mg/jni/org_greenstone_mg_MGPassesWrapper.h

@@ -132 +132 @@
 /*
  * Class:     org_greenstone_mg_MGPassesWrapper
+ * Method:    exitValue
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_greenstone_mg_MGPassesWrapper_exitValue
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_greenstone_mg_MGPassesWrapper
  * Method:    initIDs
  * Signature: ()V

trunk/indexers/mg/src/text/mg_passes_4jni.c

@@ -81 +81 @@
 static char *trace_name = NULL;
 
+int mg_passes_exit_value = 0;
+
 typedef struct pass_data
   {
@@ -142 +144 @@
   trace_name = NULL;
   
-  
+  mg_passes_exit_value = 0;
 }
 
@@ -283 +285 @@
 {
   int pass;
-  if (!filename || *filename == '\0')
+  if (!filename || *filename == '\0') {
+    mg_passes_exit_value = 1;
     FatalError (1, "A document collection name must be specified.");
-
-  if ((Passes & (IVF_PASS_1 | IVF_PASS_2)) == (IVF_PASS_1 | IVF_PASS_2))
+  }
+
+  if ((Passes & (IVF_PASS_1 | IVF_PASS_2)) == (IVF_PASS_1 | IVF_PASS_2)) {
+    mg_passes_exit_value = 1;
     FatalError (1, "I1 and I2 cannot be done simultaneously.");
 
-  if ((Passes & (TEXT_PASS_1 | TEXT_PASS_2)) == (TEXT_PASS_1 | TEXT_PASS_2))
+  }
+  if ((Passes & (TEXT_PASS_1 | TEXT_PASS_2)) == (TEXT_PASS_1 | TEXT_PASS_2)) {
+    mg_passes_exit_value = 1;
     FatalError (1, "T1 and T2 cannot be done simultaneously.");
-
-  if (!Passes)
+  }
+  if (!Passes) {
+    mg_passes_exit_value = 1;
     FatalError (1, "S, T1, T2, I1 or I2 must be specified.");
-
+  }
   if (trace)
     {
@@ -339 +347 @@
       pd->init_time.tv_usec -= ru.ru_utime.tv_usec + ru.ru_stime.tv_usec;
 #endif
-      if (pd->init (filename) == COMPERROR)
+      if (pd->init (filename) == COMPERROR) {
+    mg_passes_exit_value = 1;
     FatalError (1, "Error during init of \"%s\"", pd->name);
-      
+      }
 #ifdef HAVE_TIMES
       times (&tims);
@@ -464 +473 @@
     pd->done_time.tv_usec -= ru.ru_utime.tv_usec + ru.ru_stime.tv_usec;
 #endif
-    if (pd->done (filename) == COMPERROR)
+    if (pd->done (filename) == COMPERROR) {
+      mg_passes_exit_value = 1;
       FatalError (1, "Error during done of \"%s\"", pd->name);
-
+    }
 #ifdef HAVE_TIMES
     times (&tims);
@@ -532 +542 @@
 }
 
+int get_exit_value() {
+  return mg_passes_exit_value;
+}