[Aplaws-commit] r1034 - in trunk: ccm-cms/pdl/com/arsdigita/content-section ccm-core/pdl/com/arsdigita/search

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

Author: sskracic
Date: 2005-12-06 14:36:47 +0100 (Tue, 06 Dec 2005)
New Revision: 1034

Modified:
   trunk/ccm-cms/pdl/com/arsdigita/content-section/Search.pdl
   trunk/ccm-core/pdl/com/arsdigita/search/Search.pdl
Log:
  Completed isDescending() resurrection, files I forgot to
submit in r1033.


Modified: trunk/ccm-cms/pdl/com/arsdigita/content-section/Search.pdl
===================================================================
--- trunk/ccm-cms/pdl/com/arsdigita/content-section/Search.pdl	2005-12-06 13:18:00 UTC (rev 1033)
+++ trunk/ccm-cms/pdl/com/arsdigita/content-section/Search.pdl	2005-12-06 13:36:47 UTC (rev 1034)
@@ -26,14 +26,20 @@
 
    do {
      select m.object_id
-       from cat_object_category_map m
-       where m.category_id in :ids
+       from cat_object_category_map m,
+            cat_cat_subcat_trans_index cc
+       where cc.category_id in :ids
+            and cc.subcategory_id = m.category_id
+            and cc.n_paths <= :pathLimit
      union
      select i.item_id
        from cat_object_category_map cm,
+            cat_cat_subcat_trans_index cc2,
             cms_items i
-      where cm.category_id in :ids
-        and cm.object_id = i.parent_id
+      where cc2.category_id in :ids
+            and cc2.subcategory_id = cm.category_id
+            and cm.object_id = i.parent_id
+            and cc2.n_paths <= :pathLimit
    } map {
      id = m.object_id;
    }

Modified: trunk/ccm-core/pdl/com/arsdigita/search/Search.pdl
===================================================================
--- trunk/ccm-core/pdl/com/arsdigita/search/Search.pdl	2005-12-06 13:18:00 UTC (rev 1033)
+++ trunk/ccm-core/pdl/com/arsdigita/search/Search.pdl	2005-12-06 13:36:47 UTC (rev 1034)
@@ -26,8 +26,11 @@
 
    do {
      select m.object_id
-       from cat_object_category_map m
-      where m.category_id in :ids
+       from cat_object_category_map m,
+            cat_cat_subcat_trans_index cc
+      where m.category_id = cc.subcategory_id
+          and cc.category_id in :ids
+          and cc.n_paths <= :pathLimit
    } map {
      id = m.object_id;
    }