Index: openacs-4/packages/cms/tcl/module-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/module-procs-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/tcl/module-procs-oracle.xql	14 Aug 2001 18:11:30 -0000	1.2
+++ openacs-4/packages/cms/tcl/module-procs-oracle.xql	20 Aug 2001 04:35:41 -0000	1.3
@@ -3,8 +3,60 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="cm::modules::getChildFolders.gcf_get_child_folders">      
+<fullquery name="cm::modules::users::getSortedPaths.users_get_paths">      
       <querytext>
+
+          select 
+            o.object_id as item_id,
+            o.object_type || ': ' || acs_object.name(o.object_id) as item_path,
+            o.object_type as item_type
+          from
+            acs_objects o, parties p
+          where
+            o.object_id = p.party_id
+          and
+            o.object_id in ($sql_id_list)
+          order by
+            item_path
+
+     </querytext>
+</fullquery>
+
+<fullquery name="cm::modules::sitemap::getSortedPaths.sitemap_get_name">      
+      <querytext>
+
+       select 
+         item_id, 
+         content_item.get_path(item_id, :sorted_paths_root_id) as item_path,
+         content_type as item_type
+       from 
+         cr_items
+       where
+         item_id in ($sql_id_list)
+       order by item_path
+       
+
+      </querytext>
+</fullquery>
+
+<fullquery name="cm::modules::categories::getSortedPaths.get_paths">      
+      <querytext>
+           
+          select 
+            keyword_id as item_id,
+            content_keyword.get_path(keyword_id) as item_path,
+            'content_keyword' as item_type
+          from
+            cr_keywords
+          where 
+            keyword_id in ($sql_id_list)
+
+      </querytext>
+</fullquery>
+
+
+<fullquery name="cm::modules::getChildFolders.module_get_result">      
+      <querytext>
       
         select
 	  :mount_point as mount_point,
@@ -29,23 +81,23 @@
 </fullquery>
 
  
-<fullquery name="cm::modules::templates::getRootFolderId.grfi_get_root_id">      
+<fullquery name="cm::modules::templates::getRootFolderID.template_get_root_id">      
       <querytext>
       
             select content_template.get_root_folder() from dual
       </querytext>
 </fullquery>
 
  
-<fullquery name="cm::modules::sitemap::getRootFolderID.grfi_get_root_id">      
+<fullquery name="cm::modules::sitemap::getRootFolderID.sitemap_get_root_id">      
       <querytext>
       
             select content_item.get_root_folder() from dual
       </querytext>
 </fullquery>
 
  
-<fullquery name="cm::modules::types::getTreeTypes.gtt_get_tree_types">      
+<fullquery name="cm::modules::types::getTypesTree.types_get_result">      
       <querytext>
       
           select
@@ -61,11 +113,10 @@
       </querytext>
 </fullquery>
 
-
-<fullquery name="cm::modules::types::getChildFolders.gcf_get_child_folders">      
+ 
+<fullquery name="cm::modules::types::getChildFolders.get_result">      
       <querytext>
-
-		   select
+      select
                      :module_name as mount_point,
                      t.pretty_name, 
                      t.object_type,
@@ -84,15 +135,13 @@
                      supertype = :id
                    order by 
                      t.pretty_name
-
       </querytext>
 </fullquery>
 
  
-<fullquery name="cm::modules::categories::getChildFolders.gcf_get_child_folders">      
+<fullquery name="cm::modules::categories::getChildFolders.category_get_children">      
       <querytext>
-      
-                     select 
+      select 
                      :module_name as mount_point,
                      content_keyword.get_heading(keyword_id) as name, 
                      keyword_id, 
@@ -116,11 +165,10 @@
       </querytext>
 </fullquery>
 
-
-<fullquery name="cm::modules::users::getChildFolders.gcf_get_child_folders">      
+ 
+<fullquery name="cm::modules::users::getChildFolders.users_get_result">      
       <querytext>
-
-		   select
+      select
                      :module_name as mount_point,
                      g.group_name as name, 
                      g.group_id, '' as children,
@@ -139,57 +187,8 @@
                      $where_clause
                    order by 
                      name
-
       </querytext>
 </fullquery>
 
  
-<partialquery name="cm::modules::sitemap::getSortedPaths.gsp_get_sorted_paths">
-	<querytext>
-	               select 
-                         item_id, 
-                         content_item.get_path(item_id, :sorted_paths_root_id) as item_path,
-                         content_type as item_type
-                       from 
-                         cr_items
-                       where
-                         item_id in ($sql_id_list)
-                       order by item_path
-	</querytext>
-</partialquery>
-
-<partialquery name="cm::modules::categories::getSortedPaths.gsp_get_query">
-	<querytext>
-
-          select 
-            keyword_id as item_id,
-            content_keyword.get_path(keyword_id) as item_path,
-            'content_keyword' as item_type
-          from
-            cr_keywords
-          where 
-            keyword_id in ($sql_id_list)
-
-	</querytext>
-</partialquery>
-
-<partialquery name="cm::modules::users::getSortedPaths.gsp_get_sort_paths">
-	<querytext>
-
-          select 
-            o.object_id as item_id,
-            o.object_type || ': ' || acs_object.name(o.object_id) as item_path,
-            o.object_type as item_type
-          from
-            acs_objects o, parties p
-          where
-            o.object_id = p.party_id
-          and
-            o.object_id in ($sql_id_list)
-          order by
-            item_path
-
-	</querytext>
-</partialquery>
-
 </queryset>