[Bedework-commit] calendarapi r281 - in trunk: calCore/src/org/bedework/calcore/hibernate calsvc/src/org/bedework/calsvc

[svnadmin at bedework.org]

Author: douglm
Date: 2007-05-09 12:42:19 -0400 (Wed, 09 May 2007)
New Revision: 281

Modified:
   trunk/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java
   trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
Log:
Add missing properties to freebusy response

Add missed file

Modified: trunk/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java
===================================================================
--- trunk/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java	2007-05-09 00:14:29 UTC (rev 280)
+++ trunk/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java	2007-05-09 16:42:19 UTC (rev 281)
@@ -1378,6 +1378,7 @@
 
     Collection<EventInfo> events = getFreeBusyEntities(cal, start, end, ignoreTransparency);
     BwFreeBusy fb = new BwFreeBusy(who, start, end);
+    //assignGuid(fb);
 
     try {
       if (granularity != null) {

Modified: trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-05-09 00:14:29 UTC (rev 280)
+++ trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-05-09 16:42:19 UTC (rev 281)
@@ -1538,6 +1538,12 @@
     }
 
     BwFreeBusy fb = new BwFreeBusy(who, start, end);
+    assignGuid(fb);
+
+    BwAttendee att = new BwAttendee();
+    att.setAttendeeUri(userToCaladdr(who.getAccount()));
+    fb.addAttendee(att);
+
     Collection<EventInfo> events = new TreeSet<EventInfo>();
     /* Only events and freebusy for freebusy reports. */
     BwFilter filter = new BwOrFilter();
@@ -3190,6 +3196,25 @@
     val.setUid(guidPrefix + getCal().getSysid());
   }
 
+  /** Assign a guid to a freebusy object. A noop if already has a guid.
+   *
+   * @param val      BwFreeBusy object
+   * @throws CalFacadeException
+   */
+  private void assignGuid(BwFreeBusy val) throws CalFacadeException {
+    if (val == null) {
+      return;
+    }
+
+    if (val.getUid() != null) {
+      return;
+    }
+
+    String guidPrefix = "CAL-" + CalFacadeUtil.getUid();
+
+    val.setUid(guidPrefix + getCal().getSysid());
+  }
+
   private Collection<EventInfo> getEvents(BwSubscription sub, BwFilter filter,
                                           BwDateTime startDate, BwDateTime endDate,
                                           RecurringRetrievalMode recurRetrieval,