[Bedework-commit] caldav r132 - in trunk: bwcaldav/src/org/bedework/caldav/bwserver server/src/org/bedework/caldav/server

[svnadmin at bedework.org]

Author: douglm
Date: 2007-03-20 15:30:01 -0400 (Tue, 20 Mar 2007)
New Revision: 132

Modified:
   trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
   trunk/server/src/org/bedework/caldav/server/PostMethod.java
Log:
Further small caldav scheduling fixes

Modified: trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
===================================================================
--- trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2007-03-20 18:00:30 UTC (rev 131)
+++ trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2007-03-20 19:30:01 UTC (rev 132)
@@ -260,12 +260,16 @@
   public CalUserInfo getCalUserInfo(String account,
                                     boolean getDirInfo) throws WebdavException {
     try {
+      if (account == null) {
+        return null;
+      }
+
       BwSystem sys = getSvci().getSyspars();
       String userHomePath = "/" + sys.getUserCalendarRoot() +
                             "/" + account + "/";
       String defaultCalendarPath = userHomePath + sys.getUserDefaultCalendar();
-      String inboxPath = userHomePath + sys.getUserInbox();
-      String outboxPath = userHomePath + sys.getUserOutbox();
+      String inboxPath = userHomePath + sys.getUserInbox() + "/";
+      String outboxPath = userHomePath + sys.getUserOutbox() + "/";
 
       BwUserInfo dirInfo = null;
 

Modified: trunk/server/src/org/bedework/caldav/server/PostMethod.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/PostMethod.java	2007-03-20 18:00:30 UTC (rev 131)
+++ trunk/server/src/org/bedework/caldav/server/PostMethod.java	2007-03-20 19:30:01 UTC (rev 132)
@@ -209,7 +209,13 @@
                                   "No recipient(s)");
       } else {
         while (rs.hasMoreElements()) {
-          pars.recipients.add((String)rs.nextElement());
+          String[] rlist = ((String)rs.nextElement()).split(",");
+
+          if (rlist != null) {
+            for (String r: rlist) {
+              pars.recipients.add(r.trim());
+            }
+          }
         }
       }
 
@@ -253,7 +259,7 @@
 
       /* See if it's a valid calendar user. */
       SysIntf sysi = intf.getSysi();
-      String cn = organizer.getCn();
+      String cn = organizer.getOrganizerUri();
       CalUserInfo organizerInfo = sysi.getCalUserInfo(sysi.caladdrToUser(cn),
                                                       false);