Index: openacs-4/packages/edit-this-page/www/etp-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-oracle.xql	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-oracle.xql	31 Oct 2001 05:00:02 -0000	1.2
@@ -15,5 +15,17 @@
 	   and r.revision_id = :revision_id
 </querytext>
 </fullquery>
+
+<fullquery name="get_content_pages">
+<querytext>
+  select name, title, tree_sortkey as sort_order
+    from cr_items i, cr_revisions r
+   where i.parent_id = etp.get_folder_id(:package_id)
+     and i.name != 'index'
+     and i.item_id = r.item_id
+     and i.latest_revision = r.revision_id
+   order by tree_sortkey
+</querytext>
+</fullquery>
  
 </queryset>
Index: openacs-4/packages/edit-this-page/www/etp-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-postgresql.xql	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-postgresql.xql	31 Oct 2001 05:00:08 -0000	1.2
@@ -15,5 +15,17 @@
 	   and r.revision_id = :revision_id
 </querytext>
 </fullquery>
+
+<fullquery name="get_content_pages">
+<querytext>
+  select name, title, tree_sortkey as sort_order
+    from cr_items i, cr_revisions r
+   where i.parent_id = etp__get_folder_id(:package_id)
+     and i.name != 'index'
+     and i.item_id = r.item_id
+     and i.latest_revision = r.revision_id
+   order by tree_sortkey
+</querytext>
+</fullquery>
  
 </queryset>
Index: openacs-4/packages/edit-this-page/www/etp-symlink-postgres.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/Attic/etp-symlink-postgres.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/edit-this-page/www/etp-symlink-postgres.xql	31 Oct 2001 04:56:44 -0000	1.1
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<queryset>
+   <rdbms><type>postgres</type><version>7.1</version></rdbms>
+
+<fullquery name="create_symlink">
+<querytext>
+    select etp__create_symlink(:package_id, :target_id);
+</querytext>
+</fullquery>
+
+<fullquery name="all_pages">
+<querytext>
+	select i.item_id, i.name, etp__get_title(i.item_id, null) as title,
+               repeat('&nbsp;',(tree_level(i.tree_sortkey) - 1) * 4) as indent
+          from cr_items i, acs_objects o
+         where i.item_id = o.object_id
+           and o.object_type in ('content_item', 'content_folder')
+           and i.name != 'index'
+           and i.tree_sortkey not like (select tree_sortkey 
+                                          from cr_items
+                                         where item_id = -400) || '%'
+         order by i.tree_sortkey
+</querytext>
+</fullquery>
+ 
+</queryset>
Index: openacs-4/packages/edit-this-page/www/etp-symlink.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-symlink.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-symlink.tcl	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-symlink.tcl	31 Oct 2001 04:57:40 -0000	1.2
@@ -34,7 +34,6 @@
 
     if { [empty_string_p $item_id] } {
 	db_exec_plsql create_symlink {
-	    select etp_create_symlink(:package_id, :target_id);
 	}
     } else {
 	db_dml update_symlink {
@@ -61,16 +60,6 @@
     }
 
     db_multirow all_pages all_pages {
-	select i.item_id, i.name, etp_get_title(i.item_id, null) as title,
-               repeat('&nbsp;',(tree_level(i.tree_sortkey) - 1) * 4) as indent
-          from cr_items i, acs_objects o
-         where i.item_id = o.object_id
-           and o.object_type in ('content_item', 'content_folder')
-           and i.name != 'index'
-           and i.tree_sortkey not like (select tree_sortkey 
-                                          from cr_items
-                                         where item_id = -400) || '%'
-         order by i.tree_sortkey
     }
 
 }