Index: openacs-4/packages/new-portal/tcl/portal-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/new-portal/tcl/portal-procs.xql	31 May 2002 17:56:57 -0000	1.34
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql	11 Jun 2002 04:25:51 -0000	1.35
@@ -64,24 +64,8 @@
   </querytext>
 </fullquery> 
 
-<fullquery name="portal::configure.current_theme_select">      
+<fullquery name="portal::configure.portal_and_page_info_select">      
   <querytext>
-    select theme_id as cur_theme_id
-    from portals
-    where portal_id = :portal_id
-  </querytext>
-</fullquery> 
-
-<fullquery name="portal::configure.all_theme_select">      
-  <querytext>
-    select theme_id, name, description
-    from portal_element_themes
-    order by name 
-  </querytext>
-</fullquery> 
-
-<fullquery name="portal::configure.portal_select">      
-  <querytext>
     select  p.name, p.portal_id, 
     pl.filename as template, 
     pp.pretty_name as page_name, 
@@ -102,23 +86,6 @@
   </querytext>
 </fullquery> 
 
-<fullquery name="portal::configure_dispatch.move_to_page_curr_select">      
-  <querytext>
-    select region
-    from portal_element_map
-    where element_id = :element_id
-  </querytext>
-</fullquery> 
-
-<fullquery name="portal::configure_dispatch.move_to_page_target_select">      
-  <querytext>
-    select count(*) 
-    from portal_pages pp, portal_supported_regions psr 
-    where pp.layout_id = psr.layout_id 
-    and pp.page_id = :page_id
-  </querytext>
-</fullquery> 
-
 <fullquery name="portal::configure_dispatch.hide_update">      
   <querytext>
   update portal_element_map 
@@ -458,6 +425,12 @@
   </querytext>
 </fullquery> 
 
+<fullquery name="portal::get_element_region.get_element_region_select">      
+  <querytext>
+    select region from portal_element_map where element_id = :element_id
+  </querytext>
+</fullquery> 
+
 <fullquery name="portal::hideable_p_not_cached.select_hideable_p">      
   <querytext>
     select value from portal_element_parameters where element_id = :element_id and key = 'hideable_p'
@@ -475,6 +448,17 @@
   </querytext>
 </fullquery> 
 
+<fullquery name="portal::non_hidden_elements_p.non_hidden_elements_p_select">      
+  <querytext>
+    select 1
+    from dual 
+    where exists (select 1
+                  from portal_element_map pem
+                  where pem.page_id = :page_id
+                  and pem.state != 'hidden')
+  </querytext>
+</fullquery> 
+
 <fullquery name="portal::set_element_param.update">      
   <querytext>
     update portal_element_parameters set value = :value
@@ -674,7 +658,7 @@
   </querytext>
 </fullquery> 
 
-<fullquery name="portal::get_layout_region_count_not_cached.select_region_count">      
+<fullquery name="portal::get_layout_region_count_not_cached.select">      
   <querytext>
     select count(*)
     from portal_supported_regions
@@ -690,6 +674,19 @@
   </querytext>
 </fullquery> 
 
+<fullquery name="portal::get_layout_info.select_layout_info">      
+  <querytext>
+    select layout_id, name as layout_name, description as layout_description
+    from portal_layouts
+  </querytext>
+</fullquery> 
+
+<fullquery name="portal::set_layout_id.update_layout_id">      
+  <querytext>
+    update portal_pages set layout_id = :layout_id where page_id = :page_id
+  </querytext>
+</fullquery> 
+
 <fullquery name="portal::get_layout_id.get_layout_id_num_select">      
   <querytext>
     select layout_id from portal_pages where portal_id = :portal_id and sort_key = :page_num
@@ -726,6 +723,14 @@
   </querytext>
 </fullquery> 
 
+<fullquery name="portal::get_theme_info_not_cached.get_theme_info_select">      
+  <querytext>
+    select theme_id, name, description
+    from portal_element_themes
+    order by name 
+  </querytext>
+</fullquery> 
+
 <fullquery name="portal::get_page_id.get_page_id_from_name">      
    <querytext>
     select page_id