[Bedework-commit] calendarapi r1197 - trunk/calsvc/src/org/bedework/calsvc/client

[svnadmin at bedework.org]

Author: douglm
Date: 2010-03-06 13:47:03 -0500 (Sat, 06 Mar 2010)
New Revision: 1197

Modified:
   trunk/calsvc/src/org/bedework/calsvc/client/ClientState.java
Log:
It looks like we were not recalculating the filter correctly. 

A filtered alias to a filter did not work - only the first filter was applied.

Modified: trunk/calsvc/src/org/bedework/calsvc/client/ClientState.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/client/ClientState.java	2010-03-05 16:58:05 UTC (rev 1196)
+++ trunk/calsvc/src/org/bedework/calsvc/client/ClientState.java	2010-03-06 18:47:03 UTC (rev 1197)
@@ -59,6 +59,8 @@
   /* Built as we build filters. */
   private ColorMap colorMap;
 
+  private String vfilter;
+
   /**
    * @param svci
    * @param user
@@ -136,8 +138,6 @@
       return false;
     }
 
-    String vfilter = null;
-
     for (BwCalendar col: cols) {
       if (debug) {
         trace("      vpath collection:" + col.getPath());
@@ -160,8 +160,9 @@
     colorMap = new ColorMap();
     this.vpath = vpath;
     currentView = null;
-    filter = new FilterBuilder(getSvc(),
-                               colorMap).buildFilter(null, vfilter, true);
+    filter = null;
+//    filter = new FilterBuilder(getSvc(),
+  //                             colorMap).buildFilter(null, vfilter, true);
 
     return true;
   }
@@ -207,7 +208,7 @@
 
     colorMap = new ColorMap();
     filter = new FilterBuilder(getSvc(),
-                               colorMap).buildFilter(paths, null, true);
+                               colorMap).buildFilter(paths, vfilter, true);
     return filter;
   }