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

[svnadmin at bedework.org]

Author: douglm
Date: 2009-02-24 14:51:52 -0500 (Tue, 24 Feb 2009)
New Revision: 270

Modified:
   trunk/src/org/bedework/dumprestore/restore/HibRestore.java
   trunk/src/org/bedework/dumprestore/restore/rules/AuthUserFieldRule.java
   trunk/src/org/bedework/dumprestore/restore/rules/CalendarFieldRule.java
   trunk/src/org/bedework/dumprestore/restore/rules/CategoryUidRule.java
   trunk/src/org/bedework/dumprestore/restore/rules/ContactUidRule.java
   trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java
Log:
Dump and restore now complete without errors

Modified: trunk/src/org/bedework/dumprestore/restore/HibRestore.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/HibRestore.java	2009-02-24 16:50:03 UTC (rev 269)
+++ trunk/src/org/bedework/dumprestore/restore/HibRestore.java	2009-02-24 19:51:52 UTC (rev 270)
@@ -715,6 +715,8 @@
     // Ensure id not set
     o.setId(CalFacadeDefs.unsavedItemKey);
 
+    openHibSess();
+
     hibSess.save(o);
     globals.hibBatchSize++;
 

Modified: trunk/src/org/bedework/dumprestore/restore/rules/AuthUserFieldRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/AuthUserFieldRule.java	2009-02-24 16:50:03 UTC (rev 269)
+++ trunk/src/org/bedework/dumprestore/restore/rules/AuthUserFieldRule.java	2009-02-24 19:51:52 UTC (rev 270)
@@ -86,6 +86,8 @@
 
       if (name.equals("id")) { // PRE3.5
         au.setUserHref(userFld().getPrincipalRef());
+      } else if (name.equals("userHref")) {
+        au.setUserHref(stringFld());
       } else if (name.equals("account")) {
         au.setUserHref(globals.rintf.getUser(stringFld()).getPrincipalRef());
       } else if (name.equals("user")) {

Modified: trunk/src/org/bedework/dumprestore/restore/rules/CalendarFieldRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/CalendarFieldRule.java	2009-02-24 16:50:03 UTC (rev 269)
+++ trunk/src/org/bedework/dumprestore/restore/rules/CalendarFieldRule.java	2009-02-24 19:51:52 UTC (rev 270)
@@ -121,6 +121,8 @@
       ent.setLastRefresh(stringFld());
     } else if (name.equals("lastRefreshStatus")) {
       ent.setLastRefreshStatus(stringFld());
+    } else if (name.equals("filterExpr")) {
+      ent.setFilterExpr(stringFld());
     } else if (name.equals("remoteId")) {
       ent.setRemoteId(stringFld());
     } else if (name.equals("remotePw")) {

Modified: trunk/src/org/bedework/dumprestore/restore/rules/CategoryUidRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/CategoryUidRule.java	2009-02-24 16:50:03 UTC (rev 269)
+++ trunk/src/org/bedework/dumprestore/restore/rules/CategoryUidRule.java	2009-02-24 19:51:52 UTC (rev 270)
@@ -26,7 +26,9 @@
 package org.bedework.dumprestore.restore.rules;
 
 import org.bedework.calfacade.BwCategory;
+import org.bedework.calfacade.base.CategorisedEntity;
 import org.bedework.calfacade.svc.BwAuthUser;
+import org.bedework.calfacade.svc.EventInfo;
 import org.bedework.dumprestore.restore.RestoreGlobals;
 
 /** Build an OwnerUidKey then retrieve and store the object..
@@ -53,7 +55,13 @@
 
     if (top() instanceof BwAuthUser) {
       ((BwAuthUser)top()).getPrefs().getCategoryPrefs().add(ent);
+    } else if (top() instanceof EventInfo) {
+      ((EventInfo)top()).getEvent().addCategory(ent);
+    } else if (top() instanceof CategorisedEntity) {
+      ((CategorisedEntity)top()).addCategory(ent);
     } else {
+      warn("Unknown top element type for category " +
+           top().getClass().getName());
       push(ent);
     }
   }

Modified: trunk/src/org/bedework/dumprestore/restore/rules/ContactUidRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/ContactUidRule.java	2009-02-24 16:50:03 UTC (rev 269)
+++ trunk/src/org/bedework/dumprestore/restore/rules/ContactUidRule.java	2009-02-24 19:51:52 UTC (rev 270)
@@ -57,7 +57,8 @@
     } else if (top() instanceof EventInfo) {
       ((EventInfo)top()).getEvent().addContact(ent);
     } else {
-      handleException(new Exception("Unexpected stack top "));
+      handleException(new Exception("Unexpected stack top  Found class " +
+                                    top().getClass().getName()));
     }
   }
 }

Modified: trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java	2009-02-24 16:50:03 UTC (rev 269)
+++ trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java	2009-02-24 19:51:52 UTC (rev 270)
@@ -185,17 +185,8 @@
       return true;
     }
 
-    if (name.equals("container")) {
-      /* Done
-      // Switch things around
-      BwCalendar parent = (BwCalendar)entity;
-      pop();
-      ((BwCalendar)top()).setCalendar(parent);
-      */
-      return true;
-    }
-
-    if (name.equals("calendar-path")) {     // PRE3.5
+    if (name.equals("colPath") ||
+        name.equals("calendar-path")) {     // PRE3.5
       String path = stringFld();
 
       if ((path != null) && (path.length() > 0)) {