Index: openacs-4/packages/new-portal/www/place-element-other-page.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element-other-page.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/www/place-element-other-page.tcl	12 Mar 2002 05:18:21 -0000	1.2
+++ openacs-4/packages/new-portal/www/place-element-other-page.tcl	29 Mar 2002 17:15:08 -0000	1.3
@@ -4,14 +4,7 @@
 template::multirow create pages page_id pretty_name element_id
 set other_page_avail_p 0
 
-db_foreach other_pages_select {
-    select page_id, pretty_name
-     from portal_pages pp
-     where
-       pp.portal_id = :portal_id 
-       and pp.page_id != :page_id
-    order by sort_key
-} {
+db_foreach other_pages_select {} {
     set other_page_avail_p 1
 
     template::multirow append pages \
Index: openacs-4/packages/new-portal/www/place-element-other-page.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element-other-page.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/new-portal/www/place-element-other-page.xql	29 Mar 2002 17:15:08 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="other_pages_select">
+<querytext>
+select page_id, pretty_name
+from portal_pages pp
+where
+pp.portal_id = :portal_id 
+and pp.page_id != :page_id
+order by sort_key
+</querytext>
+</fullquery>
+
+</queryset>
\ No newline at end of file
Index: openacs-4/packages/new-portal/www/place-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/new-portal/www/place-element.tcl	23 Jan 2002 00:08:06 -0000	1.28
+++ openacs-4/packages/new-portal/www/place-element.tcl	29 Mar 2002 17:15:08 -0000	1.29
@@ -14,42 +14,23 @@
 
 # this template gets its vars from the layout template (e.g. simple2.adp)
 
-db_1row select_num_regions "
-select count(*) as num_regions
-from portal_supported_regions
-where layout_id = :layout_id"
+db_1row select_num_regions {}
 
 # get the elements for this region.
 set region_count 0
 template::multirow create element_multi element_id name sort_key state hideable_p page_id 
 
-db_foreach select_elements_by_region {
-    select element_id, pem.pretty_name as name,  pem.sort_key, state, pem.page_id as page_id
-    from portal_element_map pem, portal_pages pp
-    where
-    pp.portal_id = :portal_id 
-    and pem.page_id = pp.page_id
-    and pp.page_id = :page_id
-    and region = :region 
-    and state != 'hidden'
-    order by sort_key } {
+db_foreach select_elements_by_region {} {
 
-        set hideable_p [portal::get_element_param $element_id "hideable_p"]
-        
-	template::multirow append element_multi \
-		$element_id $name $sort_key $state $hideable_p $page_id
-	incr region_count
-    }
+    set hideable_p [portal::get_element_param $element_id "hideable_p"]
+    
+    template::multirow append element_multi \
+	    $element_id $name $sort_key $state $hideable_p $page_id
+    incr region_count
+}
 
 
-db_1row select_all_noimm_count \
-"select count(*) as all_count
-from portal_element_map pem, portal_pages pcp
-where
-pcp.portal_id = :portal_id
-and pem.page_id = pcp.page_id
-and state != 'hidden'
-and region not like 'i%'"
+db_1row select_all_noimm_count {}
 
 # Set up the form target
 set target_stub [lindex [ns_conn urlv] [expr [ns_conn urlc] - 1]]
@@ -59,15 +40,7 @@
 
 append show_html "<select name=element_id>"
 
-db_foreach hidden_elements {
-    select element_id, name
-     from portal_element_map pem, portal_pages pp
-     where
-       pp.portal_id = :portal_id 
-       and pp.page_id = pem.page_id
-       and pem.state = 'hidden'
-    order by name
-} {
+db_foreach hidden_elements {} {
     set show_avail_p 1
     append show_html "<option value=$element_id>$name</option>\n"
 }
Index: openacs-4/packages/new-portal/www/place-element.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/new-portal/www/place-element.xql	29 Mar 2002 17:15:08 -0000	1.1
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="select_num_regions">
+<querytext>
+select count(*) as num_regions
+from portal_supported_regions
+where layout_id = :layout_id
+</querytext>
+</fullquery>
+
+<fullquery name="select_elements_by_region">
+<querytext>
+select element_id, pem.pretty_name as name,  pem.sort_key, state, pem.page_id as page_id
+from portal_element_map pem, portal_pages pp
+where
+pp.portal_id = :portal_id 
+and pem.page_id = pp.page_id
+and pp.page_id = :page_id
+and region = :region 
+and state != 'hidden'
+order by sort_key 
+</querytext>
+</fullquery>
+
+<fullquery name="select_all_noimm_count">
+<querytext>
+select count(*) as all_count
+from portal_element_map pem, portal_pages pcp
+where
+pcp.portal_id = :portal_id
+and pem.page_id = pcp.page_id
+and state != 'hidden'
+and region not like 'i%'
+</querytext>
+</fullquery>
+
+
+<fullquery name="hidden_elements">
+<querytext>
+select element_id, name
+from portal_element_map pem, portal_pages pp
+where
+pp.portal_id = :portal_id 
+and pp.page_id = pem.page_id
+and pem.state = 'hidden'
+order by name
+</querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/new-portal/www/template-place-element.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/template-place-element.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/new-portal/www/template-place-element.xql	29 Mar 2002 17:15:08 -0000	1.1
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="select_num_regions">
+<querytext>
+select count(*) as num_regions
+from portal_supported_regions
+where layout_id = :layout_id"
+</querytext>
+</fullquery>
+
+<fullquery name="select_elements_by_region">
+<querytext>
+select element_id, pem.pretty_name as name, pem.sort_key, state, pp.page_id, pd.description
+from portal_element_map pem, portal_datasources pd, portal_pages pp
+where
+pp.portal_id = :portal_id 
+and pp.page_id = :page_id
+and pem.page_id = pp.page_id
+and pem.datasource_id  = pd.datasource_id
+and region = :region 
+and state != 'hidden'
+order by sort_key 
+</querytext>
+</fullquery>
+
+<fullquery name="select_param">
+<querytext>
+select value as shadeable_p from portal_element_parameters where key = :key and element_id = :element_id
+</querytext>
+</fullquery>
+
+<fullquery name="select_all_noimm_count">
+<querytext>
+select count(*) as all_count
+from portal_element_map pem, portal_pages pp
+where
+    pp.portal_id = :portal_id
+    and pp.page_id = :page_id
+    and pp.page_id = pem.page_id
+    and state != 'hidden'
+    and region not like 'i%'
+</querytext>
+</fullquery>
+
+<fullquery name="hidden_elements">
+<querytext>
+select element_id, name
+from portal_element_map pem, portal_pages pp
+where
+pp.portal_id = :portal_id 
+and pp.page_id = :page_id
+and pp.page_id = pem.page_id 
+and pem.state = 'hidden'
+order by name
+</querytext>
+</fullquery>
+
+</queryset>
\ No newline at end of file