[Bedework-commit] calendarapi r750 - in releases/bedework-3.4.1.1a: calFacade/src/org/bedework/calfacade icalendar/src/org/bedework/icalendar

[svnadmin at bedework.org]

Author: douglm
Date: 2008-11-24 23:59:41 -0500 (Mon, 24 Nov 2008)
New Revision: 750

Modified:
   releases/bedework-3.4.1.1a/calFacade/src/org/bedework/calfacade/BwLocation.java
   releases/bedework-3.4.1.1a/icalendar/src/org/bedework/icalendar/BwEventUtil.java
Log:
Fix to avoid some unpleasant consequences of importing bad data via the admin client

Modified: releases/bedework-3.4.1.1a/calFacade/src/org/bedework/calfacade/BwLocation.java
===================================================================
--- releases/bedework-3.4.1.1a/calFacade/src/org/bedework/calfacade/BwLocation.java	2008-11-24 21:37:21 UTC (rev 749)
+++ releases/bedework-3.4.1.1a/calFacade/src/org/bedework/calfacade/BwLocation.java	2008-11-25 04:59:41 UTC (rev 750)
@@ -220,6 +220,9 @@
    * @see org.bedework.calfacade.base.CollatableEntity#getCollateValue()
    */
   public String getCollateValue() {
+    if (getAddress().getValue() == null) {
+      return "";
+    }
     return getAddress().getValue();
   }
 

Modified: releases/bedework-3.4.1.1a/icalendar/src/org/bedework/icalendar/BwEventUtil.java
===================================================================
--- releases/bedework-3.4.1.1a/icalendar/src/org/bedework/icalendar/BwEventUtil.java	2008-11-24 21:37:21 UTC (rev 749)
+++ releases/bedework-3.4.1.1a/icalendar/src/org/bedework/icalendar/BwEventUtil.java	2008-11-25 04:59:41 UTC (rev 750)
@@ -550,31 +550,20 @@
           }
         } else if (prop instanceof Location) {
           /* ------------------- Location -------------------- */
-          String lang = getLang(prop);
-          String uid = getUidPar(prop);
-          String venueUid = getVenue(prop);
-
           BwLocation loc = null;
+          //String uid = getUidPar(prop);
 
-          if (venueUid != null) {
-            loc = cb.findVenueLocation(venueUid);
+          /* At the moment Mozilla lightning is broken and this leads to all
+           * sorts of problems.
+          if (uid != null) {
+            loc = cb.getLocation(uid);
+          }
+           */
 
-            if (loc == null) {
-              loc = BwLocation.makeLocation();
-              loc.setAddress(new BwString(lang, pval));
-              loc.setVenueUid(venueUid);
+          String lang = getLang(prop);
+          BwString addr = null;
 
-              // We'll add it when the venue is set
-            }
-          } else {
-            /* At the moment Mozilla lightning is broken and this leads to all
-             * sorts of problems.
-            if (uid != null) {
-              loc = cb.getLocation(uid);
-            }
-             */
-
-            BwString addr = null;
+          if (pval != null) {
             if (loc == null) {
               addr = new BwString(lang, pval);
               loc = cb.findLocation(addr);