Changeset 75

Timestamp:

02/03/06 11:21:56

Author:

douglm

Message:

Some fixes to the conversion from 2.3

Files:

• trunk/calendar3/config/configs/democal.properties (modified) (1 diff)
• trunk/calendar3/docs/todo.txt (modified) (1 diff)
• trunk/calendar3/dumprestore/build.xml (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java (modified) (7 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreGlobals.java (modified) (2 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityRule.java (modified) (2 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/FilterRule.java (modified) (1 diff)

trunk/calendar3/config/configs/democal.properties

@@ -239 +239 @@
-
-org.bedework.restore.arg.dumpfile=${calendar.dir}/dumprestore/initcaldata.xml
-org.bedework.restore.arg.fixowner=
-org.bedework.restore.arg.debug=-debug
-org.bedework.restore.arg.from2p3px=

trunk/calendar3/docs/todo.txt

@@ -4 +4 @@
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
+Views not sorted in selection list
---------------------------------------------------------------------------------
-Try a change and see if we get mailed.

trunk/calendar3/dumprestore/build.xml

@@ -219 +219 @@
-      <arg value="${org.bedework.restore.arg.dumpfile}" />
-      <arg value="${org.bedework.restore.arg.from2p3px}" />
-      <arg line="${org.bedework.restore.arg.fixowner}" />
-      <arg line="${org.bedework.restore.arg.defaultpubliccal}" />
-      <arg line="${org.bedework.restore.arg.timezones}" />

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

@@ -103 +103 @@
-  private RestoreGlobals globals = new RestoreGlobals();
-
-  private BwView curView;
-
-  private Digester digester;
-
@@ -187 +185 @@
-      prefs.setOwner(o);
-
+      // Create the default view
+
+      BwView curView = new BwView();
+
+      curView.setName(globals.syspars.getDefaultUserViewName()); // XXX
+      curView.setOwner(o);
+
+      prefs.addView(curView);
+      prefs.setPreferredView(curView.getName());
+
-      if (globals.publicUser.equals(o)) {
-        /* Subscribe to all top level collections
@@ -195 +203 @@
-        while (calit.hasNext()) {
-          BwCalendar cal = (BwCalendar)calit.next();
-globals.publicUser, cal
+curView, o, cal, true, false
-        }
-      } else {
@@ -203 +211 @@
-
-        // Add default subscription for default calendar.
-
-
-
-
+
-
-        // Add default subscription for trash calendar.
-
-        cal = (BwCalendar)globals.trashCalendars.get(new Integer(o.getId()));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        Collection s = globals.subscriptionsTbl.getCalendarids(o);
@@ -237 +229 @@
-             * Make up a subscription.
-             */
-
-
-
-
+
+
-          }
-        }
@@ -254 +244 @@
-   *
-   * @param p
+   * @param view
-   * @param user     BwUser object
-   * @param cal      BwCalendar object
-toplevel
+publicCalendar
-   * @throws Throwable
-   */
-
-
+
+
+
+
-    globals.subscriptions++;
-
+
+
-    sub.setOwner(user);
-    p.addSubscription(sub);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }
@@ -303 +298 @@
-        globals.defaultPublicCalPath = args[i];
-        trace("Setting null event calendars to " + args[i]);
-      } else if (argpar("-fixOwner", args, i)) {
-        i++;
-        globals.fixOwnerAccount = args[i];
-      } else if (args[i].equals("-from2p3px")) {
-        globals.from2p3px = true;

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

@@ -166 +166 @@
-  public HashMap filterToCal = new HashMap();
-
-  /** Account name used to fix missing or changed owners */
-  public String fixOwnerAccount;
-
-  /** Account used to fix missing or changed owners */
-  public BwUser fixOwner;
-
-  /** For each of these we update events to have the appropriate calendar id.
-   * Any event which already has a calendar id turned up in two calendars.
@@ -685 +679 @@
-
-    return publicUser;
-  }
-
-  /** Get the account used to fix creators and owners of entities
-   *
-   * @return BwUser account
-   * @throws Throwable if account name not defined
-   */
-  public BwUser getFixOwner() throws Throwable {
-    if (fixOwner != null) {
-      return fixOwner;
-    }
-
-    /* See if it's in the user map first. */
-
-    if (fixOwnerAccount == null) {
-      throw new Exception("fixOwnerAccount must be defined");
-    }
-
-    fixOwner = usersTbl.get(fixOwnerAccount);
-
-    if (fixOwner == null) {
-      // Create it
-      fixOwner = new BwUser(fixOwnerAccount);
-      fixOwner.setCategoryAccess(getDefaultPersonalAccess());
-      fixOwner.setLocationAccess(getDefaultPersonalAccess());
-      fixOwner.setSponsorAccess(getDefaultPersonalAccess());
-
-      fixOwner.setId(1);
-
-      if (rintf != null) {
-        rintf.restoreUser(fixOwner);
-      }
-
-      usersTbl.put(fixOwner);
-    }
-
-    return fixOwner;
-  }
-

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

@@ -55 +55 @@
-
-import org.bedework.calfacade.base.BwShareableDbentity;
-import org.bedework.calfacade.BwUser;
-import org.bedework.dumprestore.restore.RestoreGlobals;
-
-
-import org.xml.sax.Attributes;
-
-/**
-@
+ @ 
- * @version 1.0
- */
@@ -112 +110 @@
-      if (entity.getCreator() == null) {
-        warn(name + " " + entity.getId() + " has no creator, set to " +
-FixOwn
+PublicUs
-
-FixOwn
+PublicUs
-      }
-
-      if (entity.getOwner() == null) {
-
+
+
-
-if (entity.getPublick()) {
-
-} else
-owner = globals.getFixOwner(
+entity.setOwner(globals.getPublicUser());
+
+if (!entity.getPublick())
+warn(name + " " + entity.getId() + " is NOT public"
-        }
-        warn(name + " " + entity.getId() + " has no owner, set to " +
-            owner.getAccount());
-
-        entity.setOwner(owner);
-      }
-    } catch (Throwable t) {

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

@@ -168 +168 @@
-        }
-
-
-
-
-
-
-
+
-        entity.setPublick(true);
-      }