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

[svnadmin at bedework.org]

Author: douglm
Date: 2009-02-13 10:51:04 -0500 (Fri, 13 Feb 2009)
New Revision: 263

Modified:
   trunk/src/org/bedework/dumprestore/restore/HibRestore.java
   trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java
   trunk/src/org/bedework/dumprestore/restore/RestoreIntf.java
   trunk/src/org/bedework/dumprestore/restore/rules/CategoryRule.java
   trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java
Log:
Change to help fix dump/restore. Use uid throughout for retrieval of event properties.

Modified: trunk/src/org/bedework/dumprestore/restore/HibRestore.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/HibRestore.java	2009-02-11 03:20:45 UTC (rev 262)
+++ trunk/src/org/bedework/dumprestore/restore/HibRestore.java	2009-02-13 15:51:04 UTC (rev 263)
@@ -608,32 +608,18 @@
   }
 
   /* (non-Javadoc)
-   * @see org.bedework.dumprestore.restore.RestoreIntf#getCategory(org.bedework.dumprestore.restore.OwnerBwStringKey)
+   * @see org.bedework.dumprestore.restore.RestoreIntf#getCategory(org.bedework.dumprestore.restore.OwnerUidKey)
    */
-  public BwCategory getCategory(OwnerBwStringKey key) throws Throwable {
-    openHibSess();
-
-    StringBuilder sb = new StringBuilder();
-
-    sb.append("from ");
-    sb.append(BwCategory.class.getName());
-    sb.append(" ent where ");
-    addBwStringKeyTerms(key.str, "word", sb);
-    sb.append(" and ent.owner=:owner");
-
-    hibSession.createQuery(sb.toString());
-
-    addBwStringKeyvals(hibSession, key.str);
-    hibSession.setEntity("owner", key.getOwner());
-
-    return (BwCategory)hibSession.getUnique();
+  public BwCategory getCategory(OwnerUidKey key) throws Throwable {
+    // We don't need the owner - uid is unique
+    return getCategory(key.getUid());
   }
 
   public BwCategory getCategory(String uid) throws Throwable {
     openHibSess();
 
     Query q = hibSess.createQuery("from " + BwCategory.class.getName() +
-                                  " loc where loc.uid=:uid");
+                                  " cat where cat.uid=:uid");
     q.setString("uid", uid);
 
     return (BwCategory)q.uniqueResult();

Modified: trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java	2009-02-11 03:20:45 UTC (rev 262)
+++ trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java	2009-02-13 15:51:04 UTC (rev 263)
@@ -302,12 +302,12 @@
 
   /**
    */
-  public static class CategoryMap extends HashMap<Integer, OwnerBwStringKey> {
+  public static class CategoryMap extends HashMap<Integer, OwnerUidKey> {
     /**
      * @param val
      */
     public void put(BwCategory val) {
-      put(val.getId(), new OwnerBwStringKey(val.getOwner(), val.getWord()));
+      put(val.getId(), new OwnerUidKey(val.getOwner(), val.getUid()));
     }
   }
 

Modified: trunk/src/org/bedework/dumprestore/restore/RestoreIntf.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/RestoreIntf.java	2009-02-11 03:20:45 UTC (rev 262)
+++ trunk/src/org/bedework/dumprestore/restore/RestoreIntf.java	2009-02-13 15:51:04 UTC (rev 263)
@@ -300,11 +300,11 @@
   public BwCalendar getCalendar(String path) throws Throwable;
 
   /**
-   * @param key - bwstring + owner
+   * @param key - uid + owner
    * @return BwCategory
    * @throws Throwable
    */
-  public BwCategory getCategory(OwnerBwStringKey key) throws Throwable;
+  public BwCategory getCategory(OwnerUidKey key) throws Throwable;
 
   /**
    * @param uid

Modified: trunk/src/org/bedework/dumprestore/restore/rules/CategoryRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/CategoryRule.java	2009-02-11 03:20:45 UTC (rev 262)
+++ trunk/src/org/bedework/dumprestore/restore/rules/CategoryRule.java	2009-02-13 15:51:04 UTC (rev 263)
@@ -78,8 +78,6 @@
 
     fixSharableEntity(entity, "Category");
 
-    globals.categoriesTbl.put(entity);
-
     if (entity.getUid() == null) {
       if (thisOrAfterVersion(3, 5)) {
         error("Missing uid for category " + entity);
@@ -88,6 +86,8 @@
       entity.initUid();
     }
 
+    globals.categoriesTbl.put(entity);
+
     try {
       if (globals.rintf != null) {
         globals.rintf.restoreCategory(entity);

Modified: trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java	2009-02-11 03:20:45 UTC (rev 262)
+++ trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java	2009-02-13 15:51:04 UTC (rev 263)
@@ -44,7 +44,6 @@
 import org.bedework.calfacade.svc.BwAdminGroup;
 import org.bedework.calfacade.svc.BwAuthUser;
 import org.bedework.calfacade.timezones.CalTimezones;
-import org.bedework.dumprestore.restore.OwnerBwStringKey;
 import org.bedework.dumprestore.restore.OwnerUidKey;
 import org.bedework.dumprestore.restore.RestoreGlobals;
 import org.bedework.dumprestore.restore.RestoreGlobals.OrganizerEntity;
@@ -386,7 +385,7 @@
 
     int id = Integer.parseInt(fldval);
 
-    OwnerBwStringKey key = globals.categoriesTbl.get(id);
+    OwnerUidKey key = globals.categoriesTbl.get(id);
 
     BwCategory val = null;