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.44.2.2 -r1.44.2.3
--- openacs-4/packages/new-portal/tcl/portal-procs.xql	4 Oct 2005 16:25:04 -0000	1.44.2.2
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql	12 Oct 2005 11:18:17 -0000	1.44.2.3
@@ -132,25 +132,29 @@
 
     <fullquery name="portal::configure_dispatch.revert_max_page_id_select">
         <querytext>
-            select max(page_id)
+            select page_id
             from portal_pages
             where portal_id = :portal_id
+	    order by sort_key desc
+	    limit 1
         </querytext>
     </fullquery>
 
     <fullquery name="portal::configure_dispatch.revert_min_page_id_select">
         <querytext>
-            select min(page_id)
+            select page_id
             from portal_pages
             where portal_id = :portal_id
+	    order by sort_key
+	    limit 1
         </querytext>
     </fullquery>
 
     <fullquery name="portal::configure_dispatch.revert_move_elements_for_del">
         <querytext>
             select element_id
             from portal_element_map
-            where page_id = :max_page_id
+            where page_id = :page_id
         </querytext>
     </fullquery>
 
@@ -173,25 +177,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="portal::configure_dispatch.revert_page_update">
-        <querytext>
-            update portal_pages
-            set pretty_name = :pretty_name,
-                layout_id = :layout_id
-            where page_id = :target_page_id
-        </querytext>
-    </fullquery>
-
-
-    <fullquery name="portal::configure_dispatch.revert_page_update">
-        <querytext>
-            update portal_pages
-            set pretty_name = :pretty_name,
-                layout_id = :layout_id
-            where page_id = :target_page_id
-        </querytext>
-    </fullquery>
-
     <fullquery name="portal::configure_dispatch.hide_all_elements">
         <querytext>
 		update portal_element_map		
@@ -200,7 +185,6 @@
         </querytext>
     </fullquery>
 
-
     <fullquery name="portal::configure_dispatch.revert_get_source_elements">
 	<querytext>
             select region,
@@ -247,6 +231,30 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::configure_dispatch.revert_source_pages">
+        <querytext>
+            select page_id, sort_key
+            from portal_pages
+            where portal_id = :template_id
+        </querytext>
+    </fullquery>
+
+    <fullquery name="portal::configure_dispatch.revert_set_target_page_sort_key">
+        <querytext>
+            update portal_pages
+            set sort_key = :sort_key
+            where page_id = :page_id
+        </querytext>
+    </fullquery>
+
+    <fullquery name="portal::configure_dispatch.revert_target_pages">
+        <querytext>
+            select page_id, sort_key
+            from portal_pages
+            where portal_id = :portal_id
+        </querytext>
+    </fullquery>
+
     <fullquery name="portal::configure_dispatch.update_theme">
         <querytext>
             update portals
@@ -396,6 +404,24 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::configure_dispatch.revert_get_source_page_id">
+        <querytext>
+            select page_id
+            from portal_pages
+            where portal_id = :template_id
+            and sort_key = :sort_key
+        </querytext>
+    </fullquery>
+
+    <fullquery name="portal::configure_dispatch.revert_page_update">
+        <querytext>
+            update portal_pages
+            set pretty_name = :pretty_name,
+                layout_id = :layout_id
+            where page_id = :target_page_id
+        </querytext>
+    </fullquery>
+
     <fullquery name="portal::add_element_to_region.template_insert">
         <querytext>
             insert into portal_element_map