[Aplaws-commit] r147 - in ccm-core/trunk: . pdl/com/arsdigita/categorization

[<ssk...@re...>]

Author: sskracic
Date: 2004-12-09 19:10:06 +0100 (Thu, 09 Dec 2004)
New Revision: 147

Modified:
   ccm-core/trunk/application.xml
   ccm-core/trunk/pdl/com/arsdigita/categorization/query-getSubcategories.ora.pdl
   ccm-core/trunk/pdl/com/arsdigita/categorization/query-getSubcategories.pg.pdl
Log:
   Corrected getSubcategories query so that it filters out related categories
that are not children, but only related terms.  Oh, and bump the release
number while we're at it.


Modified: ccm-core/trunk/application.xml
===================================================================
--- ccm-core/trunk/application.xml	2004-12-08 22:01:19 UTC (rev 146)
+++ ccm-core/trunk/application.xml	2004-12-09 18:10:06 UTC (rev 147)
@@ -3,7 +3,7 @@
 <ccm:application name="ccm-core"
            prettyName="Core"
               version="6.1.0"
-              release="16"
+              release="17"
                webapp="ROOT"
            buildHooks="build-hooks.xml"
             xmlns:ccm="http://ccm.redhat.com/ccm-project">

Modified: ccm-core/trunk/pdl/com/arsdigita/categorization/query-getSubcategories.ora.pdl
===================================================================
--- ccm-core/trunk/pdl/com/arsdigita/categorization/query-getSubcategories.ora.pdl	2004-12-08 22:01:19 UTC (rev 146)
+++ ccm-core/trunk/pdl/com/arsdigita/categorization/query-getSubcategories.ora.pdl	2004-12-09 18:10:06 UTC (rev 147)
@@ -36,12 +36,14 @@
         select g.name,
                g.category_id,
                count(sd2.category_id) as sub_count, abstract_p, sd1.sort_key
-        from cat_categories g,  
+        from cat_categories g,
              cat_category_category_map sd1,
              cat_category_category_map sd2
         where sd1.category_id = :objectID
           and g.category_id = sd1.related_category_id
+          and sd1.relation_type = 'child'
           and sd2.category_id(+) = sd1.related_category_id
+          and sd2.relation_type(+) = 'child'
         group by g.name, g.category_id, abstract_p, sd1.sort_key
     } map {
         id = g.category_id;

Modified: ccm-core/trunk/pdl/com/arsdigita/categorization/query-getSubcategories.pg.pdl
===================================================================
--- ccm-core/trunk/pdl/com/arsdigita/categorization/query-getSubcategories.pg.pdl	2004-12-08 22:01:19 UTC (rev 146)
+++ ccm-core/trunk/pdl/com/arsdigita/categorization/query-getSubcategories.pg.pdl	2004-12-09 18:10:06 UTC (rev 147)
@@ -30,14 +30,15 @@
         select g.name,
                g.category_id,
                count(sd2.category_id) as sub_count,
-               g.abstract_p, 
+               g.abstract_p,
                sd1.sort_key
         from cat_category_category_map sd1
-             left join cat_categories g on 
+             left join cat_categories g on
                        (g.category_id = sd1.related_category_id)
              left join cat_category_category_map sd2 on
-                       (sd1.related_category_id = sd2.category_id)
+                       (sd1.related_category_id = sd2.category_id and sd2.relation_type='child')
         where sd1.category_id = :objectID
+           and sd1.relation_type='child'
         group by g.name, g.category_id,g.abstract_p, sd1.sort_key
     } map {
         id = g.category_id;