Index: openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql	13 Jul 2002 03:05:24 -0000	1.19
+++ openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql	21 Aug 2002 15:22:39 -0000	1.20
@@ -137,4 +137,41 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::swap_element.get_prev_sort_key">
+        <querytext>
+            select sort_key as other_sort_key,
+                   element_id as other_element_id
+            from (select pem.sort_key,
+                         element_id
+                  from portal_element_map pem,
+                       portal_pages pp
+                  where pp.portal_id = :portal_id
+                  and pem.page_id = :my_page_id
+                  and pp.page_id = pem.page_id
+                  and region = :region
+                  and pem.sort_key < :my_sort_key
+                  and state != 'pinned'
+                  order by pem.sort_key desc)
+            where rownum = 1
+        </querytext>
+    </fullquery>
+
+    <fullquery name="portal::swap_element.get_next_sort_key">
+        <querytext>
+            select sort_key as other_sort_key,
+                   element_id as other_element_id
+            from (select pem.sort_key,
+                         element_id
+                  from portal_element_map pem, portal_pages pp
+                  where pp.portal_id = :portal_id
+                  and pem.page_id = :my_page_id
+                  and pem.page_id = pp.page_id
+                  and region = :region
+                  and pem.sort_key > :my_sort_key
+                  and state != 'pinned'
+                  order by pem.sort_key)
+            where rownum = 1
+        </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql	13 Jul 2002 03:05:24 -0000	1.8
+++ openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql	21 Aug 2002 15:22:39 -0000	1.9
@@ -140,4 +140,41 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::swap_element.get_prev_sort_key">
+        <querytext>
+            select sort_key as other_sort_key,
+                   element_id as other_element_id
+            from (select pem.sort_key,
+                         element_id
+                  from portal_element_map pem,
+                       portal_pages pp
+                  where pp.portal_id = :portal_id
+                  and pem.page_id = :my_page_id
+                  and pp.page_id = pem.page_id
+                  and region = :region
+                  and pem.sort_key < :my_sort_key
+                  and state != 'pinned'
+                  order by pem.sort_key desc) as sort_keys
+                  limit 1
+        </querytext>
+    </fullquery>
+
+    <fullquery name="portal::swap_element.get_next_sort_key">
+        <querytext>
+            select sort_key as other_sort_key,
+                   element_id as other_element_id
+            from (select pem.sort_key,
+                         element_id
+                  from portal_element_map pem, portal_pages pp
+                  where pp.portal_id = :portal_id
+                  and pem.page_id = :my_page_id
+                  and pem.page_id = pp.page_id
+                  and region = :region
+                  and pem.sort_key > :my_sort_key
+                  and state != 'pinned'
+                  order by pem.sort_key) as sort_keys
+                  limit 1
+        </querytext>
+    </fullquery>
+
 </queryset>
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 -N -r1.40 -r1.41
--- openacs-4/packages/new-portal/tcl/portal-procs.xql	13 Jul 2002 03:05:24 -0000	1.40
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql	21 Aug 2002 15:22:39 -0000	1.41
@@ -378,43 +378,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="portal::swap_element.get_prev_sort_key">
-        <querytext>
-            select sort_key as other_sort_key,
-                   element_id as other_element_id
-            from (select pem.sort_key,
-                         element_id
-                  from portal_element_map pem,
-                       portal_pages pp
-                  where pp.portal_id = :portal_id
-                  and pem.page_id = :my_page_id
-                  and pp.page_id = pem.page_id
-                  and region = :region
-                  and pem.sort_key < :my_sort_key
-                  and state != 'pinned'
-                  order by pem.sort_key desc)
-            where rownum = 1
-        </querytext>
-    </fullquery>
-
-    <fullquery name="portal::swap_element.get_next_sort_key">
-        <querytext>
-            select sort_key as other_sort_key,
-                   element_id as other_element_id
-            from (select pem.sort_key,
-                         element_id
-                  from portal_element_map pem, portal_pages pp
-                  where pp.portal_id = :portal_id
-                  and pem.page_id = :my_page_id
-                  and pem.page_id = pp.page_id
-                  and region = :region
-                  and pem.sort_key > :my_sort_key
-                  and state != 'pinned'
-                  order by pem.sort_key)
-            where rownum = 1
-        </querytext>
-    </fullquery>
-
     <fullquery name="portal::swap_element.swap_sort_keys_1">
         <querytext>
             update portal_element_map