debugging.

[vamsas.git] / src / org / vamsas / test / simpleclient / VamsasArchive.java

diff --git a/src/org/vamsas/test/simpleclient/VamsasArchive.java b/src/org/vamsas/test/simpleclient/VamsasArchive.java
index 53103c6..1e96cc9 100644 (file)
--- a/src/org/vamsas/test/simpleclient/VamsasArchive.java
+++ b/src/org/vamsas/test/simpleclient/VamsasArchive.java
@@ -5,6 +5,8 @@ import java.io.File;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.vamsas.client.simpleclient.*;
 import org.vamsas.objects.core.VAMSAS;
 import org.vamsas.objects.core.VamsasDocument;
@@ -13,22 +15,41 @@ public class VamsasArchive {
   /**
    * test the org.vamsas.simpleclient.vamsasArchive class
    */
+  static Log log = LogFactory.getLog("org.vamsas.test.simpleclient.vamsasArchive");
+
   public static void main(String args[]) {
 
     try {
-      File av = new File(args[0]);
+      File av;
+      if (args.length>0)
+        av = new File(args[0]);
+      else
+        av = new File("test/vamsas.zip");
+      log.info("Opening archive "+av);
       org.vamsas.client.simpleclient.VamsasArchive varchive = new org.vamsas.client.simpleclient.VamsasArchive(av, true);
-      File backup = varchive.backupFile();
       
       VAMSAS[] roots = (VAMSAS[]) varchive.getOriginalRoots();
-      if (roots!=null)
-        ArchiveReports.rootReport(roots);
-      // do some stuff
       
+      if (roots!=null) {
+        log.info("Report on Original roots in archive:");
+        ArchiveReports.rootReport(roots, true);
+      }
+      log.info("Getting current vamsas document.");
+      VamsasDocument doc = varchive.getVamsasDocument();
+      ArchiveReports.reportDocument(doc, varchive.getOriginalArchiveReader(), true); // not modified document so references will still be valid
+      // do some stuff
+      log.info("Retrieving backup");
+      File backup = varchive.backupFile();
+      if (backup==null)
+        log.info(av+" is a New Archive.");
+      else 
+        log.info(av+" has been backed up as "+backup);
+      varchive.cancelArchive();
       if (backup!=null) {
-        System.out.println("Backup is : "+backup);
+        log.info("Backup "+backup+" is being deleted.");
+        backup.delete(); // tidy up
       }
-    } catch (Exception e) {
+      } catch (Exception e) {
       e.printStackTrace(System.err);
     }
   }