[Bedework-commit] dumprestore r123 - in trunk/src/org/bedework/dumprestore/restore: . rules

[svnadmin at bedework.org]

Author: douglm
Date: 2007-04-05 00:13:29 -0400 (Thu, 05 Apr 2007)
New Revision: 123

Modified:
   trunk/src/org/bedework/dumprestore/restore/Restore.java
   trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java
   trunk/src/org/bedework/dumprestore/restore/rules/AdminGroupFieldRule.java
   trunk/src/org/bedework/dumprestore/restore/rules/FilterRule.java
   trunk/src/org/bedework/dumprestore/restore/rules/FiltersRule.java
Log:
Further 2.3.2 conversion fixes.

Modified: trunk/src/org/bedework/dumprestore/restore/Restore.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/Restore.java	2007-04-04 17:37:22 UTC (rev 122)
+++ trunk/src/org/bedework/dumprestore/restore/Restore.java	2007-04-05 04:13:29 UTC (rev 123)
@@ -171,16 +171,14 @@
    *
    * @throws Throwable
    */
-  private void makePrefs() throws Throwable {
-    Iterator it = globals.usersTbl.values().iterator();
+  private void makePrefs() throws Throwable { // 2.3.2
     int nextId = 1;
 
     if (globals.publicUser == null) {
       throw new Exception("Public user must be defined");
     }
 
-    while (it.hasNext()) {
-      BwUser o = (BwUser)it.next();
+    for (BwUser o: globals.usersTbl.nameValues()) {
       BwPreferences prefs = new BwPreferences();
 
       prefs.setId(nextId);
@@ -210,18 +208,14 @@
           }
         }
       } else {
-        BwCalendar cal = (BwCalendar)globals.defaultCalendars.get(
-            new Integer(o.getId()));
-        prefs.setDefaultCalendar(cal);
+        BwCalendar cal = globals.userRootCalendars.get(o.getAccount());
 
-        // Add default subscription for default calendar.
+        // Add default subscription for user.
         addSubscription(prefs, curView, o, cal, true, true, false);
 
-        // Add default subscription for trash calendar.
+        cal = globals.userDefaultCalendars.get(o.getAccount());
+        prefs.setDefaultCalendar(cal);
 
-        cal = (BwCalendar)globals.trashCalendars.get(new Integer(o.getId()));
-        addSubscription(prefs, null, o, cal, false, false, false);
-
         Collection<BwSubscription> subs =
           globals.subscriptionsTbl.getSubs(PrincipalInfo.makeOwnerInfo(o));
 

Modified: trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java	2007-04-04 17:37:22 UTC (rev 122)
+++ trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java	2007-04-05 04:13:29 UTC (rev 123)
@@ -187,6 +187,8 @@
   public static final int preferredKeywords = 3;
   /** 2.3.2 */
   public static final int eventKeywords = 4;
+  /** 2.3.2 */
+  public static final int groupMembers = 5;
 
   /** counter */
   public int filters;
@@ -340,6 +342,13 @@
     public BwUser get(String account) {
       return nameMap.get(account);
     }
+
+    /**
+     * @return collection from names table.
+     */
+    public Collection<BwUser> nameValues() {
+      return nameMap.values();
+    }
   }
 
   /**
@@ -478,11 +487,12 @@
   /** */
   public AttendeeMap attendeesTbl = new AttendeeMap();
 
-  /** for 2.3.2 */
-  public HashMap<Integer, BwCalendar> defaultCalendars =
-    new HashMap<Integer, BwCalendar>();
-  /** for 2.3.2 */
-  public HashMap trashCalendars = new HashMap();
+  /** 2.3.2 */
+  public HashMap<String, BwCalendar> userRootCalendars =
+    new HashMap<String, BwCalendar>();
+  /** 2.3.2 */
+  public HashMap<String, BwCalendar> userDefaultCalendars =
+    new HashMap<String, BwCalendar>();
 
   /** */
   public CalendarMap calendarsTbl = new CalendarMap();

Modified: trunk/src/org/bedework/dumprestore/restore/rules/AdminGroupFieldRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/AdminGroupFieldRule.java	2007-04-04 17:37:22 UTC (rev 122)
+++ trunk/src/org/bedework/dumprestore/restore/rules/AdminGroupFieldRule.java	2007-04-05 04:13:29 UTC (rev 123)
@@ -65,6 +65,12 @@
     super(globals);
   }
 
+  public void fieldStart(String name) throws Exception {
+    if (name.equals("groupMembers")) {                         // 2.3.2
+      globals.whichId = RestoreGlobals.groupMembers;
+    }
+  }
+
   public void field(String name) throws Exception {
     if (name.equals("member-key")) {
       // Nothing to do.
@@ -73,6 +79,11 @@
 
     BwAdminGroup ag = (BwAdminGroup)top();
 
+    if ((globals.whichId == RestoreGlobals.groupMembers) &&
+        name.equals("id")) { // 2.3.2
+      ag.addGroupMember(userFld());
+    }
+
     if (groupTags(ag, name)) {
       return;
     }
@@ -87,6 +98,7 @@
     } else if (name.equals("description")) {
       ag.setDescription(stringFld());
     } else if (name.equals("groupMembers")) {
+      globals.whichId = RestoreGlobals.noId;
     } else {
       unknownTag(name);
     }

Modified: trunk/src/org/bedework/dumprestore/restore/rules/FilterRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/FilterRule.java	2007-04-04 17:37:22 UTC (rev 122)
+++ trunk/src/org/bedework/dumprestore/restore/rules/FilterRule.java	2007-04-05 04:13:29 UTC (rev 123)
@@ -109,6 +109,7 @@
           BwCategory cat = (BwCategory)flt.getEntity();
 
           cal.setCalendarCollection(true);
+          cal.setCalType(BwCalendar.calTypeCollection);
           globals.calLeaves.add(entity);
           globals.catCalTbl.put(cat.getId(), cal);
         } else if (entity instanceof BwCreatorFilter) {

Modified: trunk/src/org/bedework/dumprestore/restore/rules/FiltersRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/FiltersRule.java	2007-04-04 17:37:22 UTC (rev 122)
+++ trunk/src/org/bedework/dumprestore/restore/rules/FiltersRule.java	2007-04-05 04:13:29 UTC (rev 123)
@@ -109,7 +109,7 @@
         globals.rintf.restoreCalendars(userRootCal);
       }
 
-      Iterator it = globals.usersTbl.values().iterator();
+      Iterator it = globals.usersTbl.nameValues().iterator();
       while (it.hasNext()) {
         BwUser u = (BwUser)it.next();
 
@@ -135,6 +135,8 @@
     ucal.setCalendar(userRootCal);
     userRootCal.addChild(ucal);
 
+    globals.userRootCalendars.put(u.getAccount(), ucal); // 2.3.2
+
     /* Create a default calendar */
     BwCalendar cal = new BwCalendar();
     cal.setDtstamps();
@@ -150,7 +152,7 @@
 
     globals.calendarsTbl.put(cal);
 
-    globals.defaultCalendars.put(u.getId(), cal);
+    globals.userDefaultCalendars.put(u.getAccount(), cal); // 2.3.2
 
     if (globals.rintf != null) {
       globals.rintf.restoreCalendars(ucal);