Changeset 22124 for main

Timestamp:

2010-05-19T20:48:22+12:00 (14 years ago)

Author:

ak19

Message:

JDBM works on Windows now: Dr Bainbridge fixed the Java code by commenting out calls to system.err which were creating DOS prompts that wouldn't exit. Will need to redirect the output eventually, but am committing this working version (since in the early commit containing the USE_GDBM and USE_JDBM changes for Windows, only GDBM was working). Have now tested combinations of both flags in separate SVN checkouts, both with LOCAL_LIBRARY and APACHE_HTTPD turned on during compilation.

Location:

main/trunk/greenstone2/common-src/src/jdbmedit

Files:

• JdbGet.java (modified) (2 diffs)
• JdbmAPI.java (modified) (8 diffs)

main/trunk/greenstone2/common-src/src/jdbmedit/JdbGet.java

@@ -59 +59 @@
     public static void main(String[] args)
     {
+    //System.err.println("Running JdbmEdit");
 
     if (args.length != 2) {
@@ -67 +68 @@
     String key    = args[1];
 
+    //System.err.println("Args: " + args[0] + " " + args[1]);
+
         try {
 
             JdbmAPI jdbm_api = new JdbmAPI(dbname,true);
+        //System.err.println("Constructed jdbm_api");
             String val = jdbm_api.get(key);
         utf8out.println(val);

main/trunk/greenstone2/common-src/src/jdbmedit/JdbmAPI.java

@@ -77 +77 @@
 
     if (recid != 0) {
-        System.err.println("# Loading existing database table '" + TNAME +"' ...");
+        //      System.err.println("# Loading existing database table '" + TNAME +"' ...");
         hashtable_ = HTree.load(recman_, recid);
     }
@@ -84 +84 @@
         if (must_exist) {
         recman_.close();
-        System.err.println("Database table '" + TNAME +"' does not exist.");
+        //      System.err.println("Database table '" + TNAME +"' does not exist.");
         throw new IOException();
         }
         else {
-        System.err.println("# No database table '" + TNAME +"' to set.  Creating new one");
+        //      System.err.println("# No database table '" + TNAME +"' to set.  Creating new one");
         hashtable_ = HTree.createInstance(recman_);
         recman_.setNamedObject(TNAME, hashtable_.getRecid());
@@ -159 +159 @@
     {
     recman_.close();
-    System.err.println("# Done");
+    //  System.err.println("# Done");
     }
 
@@ -173 +173 @@
     }
     if (c != '\n') {
-        System.err.println("JdbmAPI: Warning, expected end-of-line character, but encountered '" + (char)c + "' ord(" + c + ")");
+        //      System.err.println("JdbmAPI: Warning, expected end-of-line character, but encountered '" + (char)c + "' ord(" + c + ")");
     }
     }
@@ -248 +248 @@
             }
             else {
-            System.err.println("JdbmAPI: Command '" + cmd + "'ended prematurely");
+            //          System.err.println("JdbmAPI: Command '" + cmd + "'ended prematurely");
             encountered_error = true;
             break;
@@ -259 +259 @@
             String vallen_str = brin.readLine();
             if (vallen_str==null) {
-            System.err.println("JdbmAPI: Command '" + cmd + "'ended prematurely");
+            //          System.err.println("JdbmAPI: Command '" + cmd + "'ended prematurely");
             encountered_error = true;
             break;
@@ -269 +269 @@
             
             if (valbuffer.length==0) {
-            System.err.println("JdbmAPI: Command '" + cmd + "'ended prematurely");
+            //          System.err.println("JdbmAPI: Command '" + cmd + "'ended prematurely");
             encountered_error = true;
             break;
@@ -284 +284 @@
         }
         else {
-            System.err.println("JdbmAPI: Unrecognised command '" + cmd + "'");
+            //          System.err.println("JdbmAPI: Unrecognised command '" + cmd + "'");
             encountered_error = true;
         }