[Bedework-commit] r658 - trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore

[svnadmin at bedework.org]

Author: douglm
Date: 2006-06-26 11:33:45 -0400 (Mon, 26 Jun 2006)
New Revision: 658

Modified:
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java
Log:
Fix restore initSyspars option as noted by David Brondsema

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java	2006-06-25 05:04:42 UTC (rev 657)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java	2006-06-26 15:33:45 UTC (rev 658)
@@ -154,8 +154,6 @@
         globals.rintf.restoreAdminGroup((BwAdminGroup)globals.getSuperGroup());
       }
     }
-
-    error("Need to implement eventrefs fixup");
   }
 
   void stats() {
@@ -361,7 +359,8 @@
   }
 
   void getConfigProperties(String[] args) throws Throwable {
-    /* Look for the appname arg */
+    /* Look for the appname and initSyspars arg */
+    boolean initSyspars = false;
 
     if (args != null) {
       for (int i = 0; i < args.length; i++) {
@@ -369,7 +368,7 @@
           i++;
           appName = args[i];
         } else if (args[i].equals("-initSyspars")) {
-          globals.config.setInitSyspars(true);
+          initSyspars = true;
         }
       }
     }
@@ -380,7 +379,9 @@
     }
 
     globals.init((DumpRestoreConfig)CalOptions.getProperty(appPrefix + appName));
-    if (globals.config.getInitSyspars() || globals.config.getFrom2p3px()) {
+    if (initSyspars ||
+        globals.config.getInitSyspars() ||
+        globals.config.getFrom2p3px()) {
       globals.syspars = (BwSystem)CalOptions.getProperty("org.bedework.syspars");
     }
   }