[Bedework-commit] webapps r772 - trunk/webcommon/src/org/bedework/webcommon/calendars

[svnadmin at bedework.org]

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

Modified:
   trunk/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.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/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java	2008-07-02 04:02:47 UTC (rev 771)
+++ trunk/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java	2008-07-02 17:32:50 UTC (rev 772)
@@ -58,6 +58,7 @@
 import org.bedework.appcommon.ClientMessage;
 import org.bedework.appcommon.ValidationError;
 import org.bedework.calfacade.BwCalendar;
+import org.bedework.calfacade.CalFacadeDefs;
 import org.bedework.calfacade.exc.CalFacadeException;
 import org.bedework.calsvci.CalSvcI;
 import org.bedework.webcommon.BwAbstractAction;
@@ -231,8 +232,15 @@
 
     if (aliasUri != null) {
       cal.setAliasUri(aliasUri);
-      cal.setCalType(BwCalendar.calTypeAlias);
-      cal.setRefreshRate(15 * 60); // 15 mins refresh
+
+      if (aliasUri.startsWith(CalFacadeDefs.bwUriPrefix)) {
+        // Internal alias
+        cal.setCalType(BwCalendar.calTypeAlias);
+      } else {
+        // External subscription
+        cal.setCalType(BwCalendar.calTypeExtSub);
+        cal.setRefreshRate(15 * 60); // 15 mins refresh
+      }
     } else if (cc) {
       cal.setCalType(BwCalendar.calTypeCollection);
     } else {