Changeset 21402 for main/trunk/greenstone2/common-src/src/jdbmedit/JdbmAPI.java

Timestamp:

2010-01-01T23:35:24+13:00 (14 years ago)

Author:

davidb

Message:

Refactoring of class to use API

File:

• main/trunk/greenstone2/common-src/src/jdbmedit/JdbmAPI.java (modified) (3 diffs)

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

@@ -45 +45 @@
     HTree          hashtable_;
 
-    public JdbmAPI(String db_filename)
+    public JdbmAPI(String db_filename,boolean must_exist)
     throws IOException
     {
@@ -56 +56 @@
 
     if (recid != 0) {
-        System.out.println("Loading existing database table '" + TNAME +"' ...");
+        System.err.println("# Loading existing database table '" + TNAME +"' ...");
         hashtable_ = HTree.load(recman_, recid);
     }
     else {
-        System.out.println("No database table '" + TNAME +"' to set.  Creating new one");
-        hashtable_ = HTree.createInstance(recman_);
-        recman_.setNamedObject(TNAME, hashtable_.getRecid());
-    }
+
+        if (must_exist) {
+        recman_.close();
+        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");
+        hashtable_ = HTree.createInstance(recman_);
+        recman_.setNamedObject(TNAME, hashtable_.getRecid());
+        }
+    }
+    }
+
+    public JdbmAPI(String db_filename)
+    throws IOException
+    {
+    // default is that database does not have to exist
+    this(db_filename,false);
     }
     
     public void append(String key, String val)
     throws IOException
-    {
-            
+    {           
     String orig_val = (String)hashtable_.get(key);           
     String new_val = orig_val + val;
@@ -127 +141 @@
     {
     recman_.close();
+    System.err.println("# Done");
     }