Index: openacs-4/packages/datamanager/tcl/datamanager-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/tcl/datamanager-procs.xql,v diff -u -r1.1.2.6 -r1.1.2.7 --- openacs-4/packages/datamanager/tcl/datamanager-procs.xql 9 Nov 2005 19:43:28 -0000 1.1.2.6 +++ openacs-4/packages/datamanager/tcl/datamanager-procs.xql 11 Nov 2005 10:04:59 -0000 1.1.2.7 @@ -3,59 +3,59 @@ - select object_type - from acs_objects - where object_id= :object_id + SELECT object_type + FROM acs_objects + WHERE object_id= :object_id - select name as object_name - from forums_forums - where forum_id=:object_id + SELECT name as object_name + FROM forums_forums + WHERE forum_id=:object_id - select faq_name as object_name - from faqs - where faq_id = :object_id + SELECT faq_name as object_name + FROM faqs + WHERE faq_id = :object_id - select title as object_name - from acs_objects - where object_id = :object_id + SELECT title as object_name + FROM acs_objects + WHERE object_id = :object_id - select pretty_name as object_name - from static_portal_content - where content_id = :object_id; + SELECT pretty_name as object_name + FROM static_portal_content + WHERE content_id = :object_id; - select title as object_name - from acs_objects - where object_id = :object_id + SELECT title as object_name + FROM acs_objects + WHERE object_id = :object_id - select title as object_name - from acs_objects - where object_id = :object_id + SELECT title as object_name + FROM acs_objects + WHERE object_id = :object_id @@ -66,10 +66,10 @@ WHERE community_id <> :comm_id and community_type='dotlrn_club' and (parent_community_id <> community_id or parent_community_id is null) - and (community_id in (select dca.community_id - from dotlrn_community_applets dca, + and (community_id in (SELECT dca.community_id + FROM dotlrn_community_applets dca, dotlrn_applets da - where dca.applet_id = da.applet_id + WHERE dca.applet_id = da.applet_id and da.applet_key= :object_type)) @@ -85,10 +85,10 @@ and dc.department_key=dd.department_key and dd.department_key=:department_key and (parent_community_id <> community_id or parent_community_id is null) - and (community_id in (select dca.community_id - from dotlrn_community_applets dca, + and (community_id in (SELECT dca.community_id + FROM dotlrn_community_applets dca, dotlrn_applets da - where dca.applet_id = da.applet_id + WHERE dca.applet_id = da.applet_id and da.applet_key=:object_type)) @@ -100,33 +100,33 @@ WHERE dca.community_id <> :comm_id and dca.community_type <> 'dotlrn_club' and (parent_community_id <> community_id or parent_community_id is null) - and (community_id in (select dca.community_id - from dotlrn_community_applets dca, + and (community_id in (SELECT dca.community_id + FROM dotlrn_community_applets dca, dotlrn_applets da - where dca.applet_id = da.applet_id + WHERE dca.applet_id = da.applet_id and da.applet_key=:object_type)) - select community_id as dest_community_id, community_type, pretty_name as name, parent_community_id - from dotlrn_communities_all - where community_id in ([join $communities_list_p ","]) + SELECT community_id as dest_community_id, community_type, pretty_name as name, parent_community_id + FROM dotlrn_communities_all + WHERE community_id in ([join $communities_list_p ","]) - select pretty_name - from dotlrn_communities_all - where community_id = :parent_community_id + SELECT pretty_name + FROM dotlrn_communities_all + WHERE community_id = :parent_community_id - SELECT object_id as trash_id + SELECT object_id as trash_id FROM acs_objects WHERE object_type='trash' and title IS NULL and context_id IS NULL and package_id IS NULL;