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

[svnadmin at bedework.org]

Author: douglm
Date: 2007-03-01 00:23:47 -0500 (Thu, 01 Mar 2007)
New Revision: 118

Modified:
   trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
   trunk/server/src/org/bedework/caldav/server/filter/CompFilter.java
   trunk/server/src/org/bedework/caldav/server/filter/Filter.java
Log:
Minor caldav report fix


Modified: trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
===================================================================
--- trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2007-02-28 14:23:40 UTC (rev 117)
+++ trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2007-03-01 05:23:47 UTC (rev 118)
@@ -430,9 +430,10 @@
     try {
       BwSubscription sub = BwSubscription.makeSubscription(cal);
 
+      /*
       if ((startDate == null) && (endDate == null)) {
         return getSvci().getEvents(sub, recurRetrieval);
-      }
+      }*/
 
       BwFilter filter = makeFilter(getEvents, getTodos, getJournals);
       return getSvci().getEvents(sub, filter, startDate, endDate,

Modified: trunk/server/src/org/bedework/caldav/server/filter/CompFilter.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/filter/CompFilter.java	2007-02-28 14:23:40 UTC (rev 117)
+++ trunk/server/src/org/bedework/caldav/server/filter/CompFilter.java	2007-03-01 05:23:47 UTC (rev 118)
@@ -129,7 +129,7 @@
   }
 
   /**
-   * @return Vector of comp filters
+   * @return Collection of comp filters
    */
   public Collection<CompFilter> getCompFilters() {
     if (compFilters == null) {

Modified: trunk/server/src/org/bedework/caldav/server/filter/Filter.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/filter/Filter.java	2007-02-28 14:23:40 UTC (rev 117)
+++ trunk/server/src/org/bedework/caldav/server/filter/Filter.java	2007-03-01 05:23:47 UTC (rev 118)
@@ -294,12 +294,30 @@
         Collection<CompFilter> subcfs = cfltr.getCompFilters();
         CompFilter subcf = subcfs.iterator().next();
 
+        boolean isNot = subcf.getIsNotDefined();
+
+        // XXX This is wrong????
         if ("VEVENT".equals(subcf.getName())) {
-          getEvents = true;
+          if (isNot) {
+            getTodos = true;
+            getJournals = true;
+          } else {
+            getEvents = true;
+          }
         } else if ("VTODO".equals(subcf.getName())) {
-          getTodos = true;
+          if (isNot) {
+            getEvents = true;
+            getJournals = true;
+          } else {
+            getTodos = true;
+          }
         } else if ("VJOURNAL".equals(subcf.getName())) {
-          getJournals = true;
+          if (isNot) {
+            getEvents = true;
+            getTodos = true;
+          } else {
+            getJournals = true;
+          }
         } else {
           /* Don't support anything else so just return an empty
              Collection
@@ -437,8 +455,8 @@
     return filtered;
   }
 
-  /** We are given a Vector of com-filters which should all name VEVENT
-   * and provide conditions for the query.
+  /** We are given a Collection of comp-filters which should all name a calendar
+   * entity and provide conditions for the query.
    *
    * @param cfs    Collection
    * @param globaltr