Changeset 544

Timestamp:

06/07/06 11:46:00

Author:

douglm

Message:

Changes for 3.0 to 3.1 conversion

Files:

• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/Dumpling.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreGlobals.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalendarRule.java (modified) (2 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java (modified) (2 diffs)

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/Dumpling.java

@@ -205 +205 @@
-    if (entity.getCalendar() == null) {
-      // Sould check validity here. Only valid for calendar roots.
-
+-path
-    } else {
-
+-path
-    }
-  }

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java

@@ -296 +296 @@
-      } else if (args[i].equals("-initSyspars")) {
-        // done earlier
+      } else if (args[i].equals("-skipspecialcals")) {
+        globals.skipSpecialCals = true;
+      } else if (args[i].equals("-fixcaltype")) {
+        globals.fixCaltype = true;
-      } else if (argpar("-f", args, i)) {
-        i++;

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreGlobals.java

@@ -95 +95 @@
-   */
-  public boolean inOwnerKey;
+
+  /** True if we skip creation of special calendars. This is for the conversion
+   * from 3.0 which may have a lot of empty special calendars created
+   */
+  public boolean skipSpecialCals;
+
+  /** True if we fix calendar type of special calendars. This is for the conversion
+   * from 3.0
+   */
+  public boolean fixCaltype;
-
-  /** Set false at start of entity, set true on entity error

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalendarRule.java

@@ -55 +55 @@
-
-import org.bedework.calfacade.BwCalendar;
+import org.bedework.calfacade.BwSystem;
-import org.bedework.dumprestore.restore.RestoreGlobals;
-
@@ -72 +73 @@
-  public void end(String ns, String name) throws Exception {
-    BwCalendar entity = (BwCalendar)pop();
+    boolean special = false;
+
-    globals.calendars++;
-
-    fixSharableEntity(entity, "Calendar");
+
+    if ((globals.fixCaltype || globals.skipSpecialCals) &&
+        entity.getCalType() == BwCalendar.calTypeFolder) {
+      // might need to fix if from 3.0
+      BwSystem sys = globals.syspars;
+      String calpath = entity.getPath();
+      String[] pes = calpath.split("/");
+      int pathLength = pes.length - 1;  // First element is empty string
+
+      if ((pathLength == 3) &&
+          sys.getUserCalendarRoot().equals(pes[1])) {
+        String calname = pes[3];
+
+        if (!calname.equals(entity.getName())) {
+          throw new Exception("Got path wrong - len = " + pathLength +
+                              " path = " + calpath +
+                              " calname = " + calname);
+        }
+
+        if (calname.equals(sys.getDefaultTrashCalendar())) {
+          entity.setCalType(BwCalendar.calTypeTrash);
+          special = true;
+        } else if (calname.equals(sys.getDeletedCalendar())) {
+          entity.setCalType(BwCalendar.calTypeDeleted);
+          special = true;
+        } else if (calname.equals(sys.getBusyCalendar())) {
+          entity.setCalType(BwCalendar.calTypeBusy);
+          special = true;
+        } else if (calname.equals(sys.getUserInbox())) {
+          entity.setCalType(BwCalendar.calTypeInbox);
+          special = true;
+        } else if (calname.equals(sys.getUserOutbox())) {
+          entity.setCalType(BwCalendar.calTypeOutbox);
+          special = true;
+        } else if (entity.getCalendarCollection()) {
+          entity.setCalType(BwCalendar.calTypeCollection);
+        }
+      }
+    }
+
+    if (special && globals.skipSpecialCals) {
+      return;
+    }
-
-    try {

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java

@@ -175 +175 @@
-    }
-
-
+-path
-      String path = stringFld();
-
@@ -181 +181 @@
-        entity.setCalendar(calendarFld());
-      } // Otherwise assume root calendar
+      return true;
+    }
+
+    if (name.equals("calendar")) {
+      // 3-0 tag - ignore
-      return true;
-    }