[Aplaws-commit] r1029 - trunk/ccm-cms/src/com/arsdigita/cms/search

[<ssk...@vh...>]

Author: sskracic
Date: 2005-12-05 16:58:22 +0100 (Mon, 05 Dec 2005)
New Revision: 1029

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/search/IntermediaQueryEngine.java
Log:
  Reverted to r1016, killed shouldDescend() API change.


Modified: trunk/ccm-cms/src/com/arsdigita/cms/search/IntermediaQueryEngine.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/search/IntermediaQueryEngine.java	2005-12-05 15:50:17 UTC (rev 1028)
+++ trunk/ccm-cms/src/com/arsdigita/cms/search/IntermediaQueryEngine.java	2005-12-05 15:58:22 UTC (rev 1029)
@@ -222,6 +222,7 @@
         f.set("types", l);
     }
 
+    // Override to use query that takes account of bundles :-(
     protected void addCategoryFilter(DataQuery query,
                                      CategoryFilterSpecification filter) {
         Category[] categories = filter.getCategories();
@@ -231,18 +232,10 @@
                 ids.add(categories[i].getID());
             }
 
-            Filter f = null;
-            if (filter.shouldDescend()) {
-                f = query.addInSubqueryFilter(
-                    "object_id",
-                    "id",
-                    "com.arsdigita.cms.searchCategoryObjectsDescend");
-            } else {
-                f = query.addInSubqueryFilter(
-                    "object_id",
-                    "id",
-                    "com.arsdigita.cms.searchCategoryObjects");
-            }
+            Filter f = query.addInSubqueryFilter(
+                "object_id",
+                "id",
+                "com.arsdigita.cms.searchCategoryItems");
 
             f.set("ids", ids);
         }