[Bedework-commit] bwwebapps r82 - releases/bedework-3.8/webcommon/src/org/bedework/webcommon/event

[svnadmin at bedework.org]

Author: douglm
Date: 2012-04-05 10:28:36 -0400 (Thu, 05 Apr 2012)
New Revision: 82

Modified:
   releases/bedework-3.8/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
Log:
Look for and remove any bogus properties we generated with the admin client backend support.

Modified: releases/bedework-3.8/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
===================================================================
--- releases/bedework-3.8/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2012-04-05 01:02:54 UTC (rev 81)
+++ releases/bedework-3.8/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2012-04-05 14:28:36 UTC (rev 82)
@@ -797,6 +797,9 @@
     return rdChanged || exdChanged;
   }
 
+  private static final String alwaysRemove =
+      "BEGIN:VEVENT\r\nUID:123456\r\nDTSTART;TYPE=DATE:20080212T000000\r\n";
+
   /* return forwardNoAction for no change
    * forward success for change otherwise error.
    */
@@ -835,7 +838,14 @@
 
       for (BwXproperty xp:  evxprops) {
         if (xp.getSkipJsp()) {
-          continue;
+          if (!xp.getName().equals(BwXproperty.bedeworkIcal)) {
+            continue;
+          }
+
+          if ((xp.getValue() == null) ||
+              !xp.getValue().startsWith(alwaysRemove)) {
+            continue;
+          }
         }
 
         // Remove this one
@@ -872,6 +882,13 @@
 
     for (BwXproperty xp:  evxprops) {
       if (xp.getSkipJsp()) {
+        if (xp.getName().equals(BwXproperty.bedeworkIcal)) {
+          if ((xp.getValue() != null) &&
+              xp.getValue().startsWith(alwaysRemove)) {
+            continue; // Bogus x-prop - remove it
+          }
+        }
+
         xprops.add(xp);
       }
     }
@@ -926,8 +943,17 @@
 
     List<BwXproperty> xprops = ev.getXproperties();
 
+    List<BwXproperty> strippedXprops = new ArrayList<BwXproperty>();
+
     if (!publishEvent) {
-      return xprops;
+      for (BwXproperty xp: xprops) {
+        if (xp.getSkipJsp()) {
+          // Should not be here
+          continue;
+        }
+        strippedXprops.add(xp);
+      }
+      return strippedXprops;
     }
 
     /* Some x-properties added by the submission client contain private
@@ -942,8 +968,6 @@
       plistMap.put(plistName, plistName);
     }
 
-    List<BwXproperty> strippedXprops = new ArrayList<BwXproperty>();
-
     for (BwXproperty xp: xprops) {
       if (plistMap.get(xp.getName()) != null) {
         strippedXprops.add(xp);