[Bedework-commit] dumprestore r214 - trunk/src/org/bedework/dumprestore/restore

[svnadmin at bedework.org]

Author: douglm
Date: 2008-07-02 13:32:47 -0400 (Wed, 02 Jul 2008)
New Revision: 214

Modified:
   trunk/src/org/bedework/dumprestore/restore/HibRestore.java
Log:
Further changes to external subscriptions support.

Change bw script to add further options and better options processing.
Make copy of config into config/bwbuild/default.

Modified: trunk/src/org/bedework/dumprestore/restore/HibRestore.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/HibRestore.java	2008-07-02 04:02:14 UTC (rev 213)
+++ trunk/src/org/bedework/dumprestore/restore/HibRestore.java	2008-07-02 17:32:47 UTC (rev 214)
@@ -60,6 +60,7 @@
 import org.bedework.calcorei.CalintfDefs;
 import org.bedework.calcorei.CoreEventsI;
 import org.bedework.calcorei.HibSession;
+import org.bedework.calcorei.CoreEventsI.UpdateEventResult;
 import org.bedework.calfacade.BwAttendee;
 import org.bedework.calfacade.BwCalendar;
 import org.bedework.calfacade.BwCategory;
@@ -428,16 +429,19 @@
 
       openHibSess();
       CoreEventsI evi = getEvents(ev.getCreator());
-      Collection<BwEventProxy> failedOverrides = evi.addEvent(saveEv,
-                                                              ei.getOverrideProxies(),
-                                                              false, // scheduling
-                                                              false);
+      UpdateEventResult uer = evi.addEvent(saveEv,
+                                           ei.getOverrideProxies(),
+                                           false, // scheduling
+                                           false);
 
-      if (failedOverrides != null) {
+      if (!uer.addedUpdated) {
+        throw new CalFacadeException(uer.errorCode);
+      }
+      if (uer.failedOverrides != null) {
         error("Following overrides failed for event ");
         error(ev.toString());
 
-        for (BwEventProxy proxy: failedOverrides) {
+        for (BwEventProxy proxy: uer.failedOverrides) {
           error(proxy.toString());
         }
       }