Changeset 28667 for main

Timestamp:

2013-11-21T18:56:48+13:00 (10 years ago)

Author:

ak19

Message:

Jdb2Txt now supports sorting the output, to bring it in line with what db2txt does nowadays. This is needed for diffcol, since GS3 demo-lucene uses jdbm.

File:

• main/trunk/greenstone2/common-src/src/jdbmedit/Jdb2Txt.java (modified) (7 diffs)

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

@@ -27 +27 @@
 import jdbm.RecordManagerFactory;
 import jdbm.helper.FastIterator;
+import jdbm.helper.StringComparator;
 import jdbm.htree.HTree;
 
@@ -33 +34 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.Iterator;
 import java.util.Properties;
+import java.util.Vector;
 
 
@@ -42 +46 @@
     RecordManager  recman_;
     HTree          hashtable_;
+    boolean        sort_;
 
     static private PrintWriter utf8out = null;
@@ -56 +61 @@
     }
 
+    // the default constructor retains default behaviour of not sorting the keys
     public Jdb2Txt(String db_filename)
     throws IOException
     {
+    this(db_filename, false);
+    }
+
+    public Jdb2Txt(String db_filename, boolean sort)
+    throws IOException
+    {
+    this.sort_ = sort;
+
     if (db_filename.endsWith(".jdb")) {
         // remove file extension as JDBM does not expect it
@@ -86 +100 @@
     String         key;
     String         val;
+    
+    Vector keylist = sort_ ? new Vector() : null;
 
         iter = hashtable_.keys();
@@ -91 +107 @@
         while (key != null) {
             val = (String) hashtable_.get(key);
-            utf8out.println("[" + key + "]");
-            utf8out.println(val);
-        // 70 hypens
-        utf8out.println("----------------------------------------------------------------------");
+
+        if(sort_) {
+        keylist.add(key);
+        }
+        else {
+        print_entry(key, val);
+        }
             key = (String) iter.next();
         }
         
+    if(sort_) {
+        Collections.sort(keylist, new StringComparator());
+        Iterator i = keylist.iterator();
+        while(i.hasNext()) {
+        key = (String)i.next();
+        val = (String) hashtable_.get(key);
+        print_entry(key, val);
+        }
+    }
+
         recman_.close();
     }
 
+    public static void print_entry(String key, String value) {
+    utf8out.println("[" + key + "]");
+    utf8out.println(value);
+    // 70 hypens
+    utf8out.println("----------------------------------------------------------------------");
+            
+    }
 
     public static void print_usage()
     {
-    System.err.println("Usage: java Jdb2Txt database-name");
+    System.err.println("Usage: java Jdb2Txt [options] database-name");
+    System.err.println("options: ");
+    System.err.println(" -sort\tsort the keys to the database before output\n");
     System.exit(-1);
     }
@@ -111 +149 @@
     public static void main(String[] args)
     {
-    if (args.length != 1) {
+    if (args.length < 1 || args.length > 2) {
         print_usage();
     }
 
     String dbname = args[0];
+    boolean sort = false;
+
+    if(args.length == 2) {
+        if(args[0].equals("-sort")) {
+        sort = true;
+        dbname = args[1];
+        } else {
+        System.err.println(args[0] + " is not a valid option\n");
+        print_usage();
+        }
+    }
 
         try {
 
-            Jdb2Txt table = new Jdb2Txt(dbname);
+            Jdb2Txt table = new Jdb2Txt(dbname, sort);
             table.db2txt();
         }