Fisheye: Tag 1.5.8.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/delete-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.8.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/delete-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/file-storage/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/delete.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/file-storage/www/delete.tcl	1 Oct 2017 12:09:46 -0000	1.10
+++ openacs-4/packages/file-storage/www/delete.tcl	15 Mar 2019 09:43:08 -0000	1.10.2.1
@@ -34,7 +34,12 @@
 
 set object_id_list [join $object_id "','"]
 
-db_multirow -extend {delete_message} delete_list get_to_be_deleted {} {
+db_multirow -extend {delete_message} delete_list get_to_be_deleted [subst {
+    select fs.object_id as fs_object_id, fs.type, fs.name, fs.parent_id,
+    acs_permission.permission_p(fs.object_id, :user_id, 'delete') as delete_p
+    from fs_objects fs
+    where fs.object_id in ('$object_id_list')
+}] {
 	  if {$delete_p} {
 	      set delete_message ""
 	      incr allowed_count
Index: openacs-4/packages/file-storage/www/move-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/move-oracle.xql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/file-storage/www/move-oracle.xql	3 Nov 2017 15:58:29 -0000	1.9
+++ openacs-4/packages/file-storage/www/move-oracle.xql	15 Mar 2019 09:45:54 -0000	1.9.2.1
@@ -13,16 +13,6 @@
     <version>8.1.6</version>
   </rdbms>
   
-  <fullquery name="get_move_objects">
-    <querytext>
-      select fs.object_id, fs.name, fs.type, fs.parent_id,
-      acs_permission.permission_p(fs.object_id, :user_id, 'delete') as move_p
-      from fs_objects fs
-      where fs.object_id in ([template::util::tcl_to_sql_list $object_id])
-	order by move_p
-    </querytext>
-  </fullquery>
-
   <fullquery name="get_folder_tree">
     <querytext>
       select
Index: openacs-4/packages/file-storage/www/move-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/move-postgresql.xql,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/file-storage/www/move-postgresql.xql	3 Nov 2017 15:58:29 -0000	1.11
+++ openacs-4/packages/file-storage/www/move-postgresql.xql	15 Mar 2019 09:45:54 -0000	1.11.2.1
@@ -12,16 +12,6 @@
     <type>postgresql</type>
     <version>7.2</version>
   </rdbms>
-  
-  <fullquery name="get_move_objects">
-    <querytext>
-      select fs.object_id, fs.name, fs.type, fs.parent_id,
-      acs_permission__permission_p(fs.object_id, :user_id, 'delete') as move_p
-      from fs_objects fs
-      where fs.object_id in ([template::util::tcl_to_sql_list $object_id])
-	order by move_p
-    </querytext>
-  </fullquery>
 
   <fullquery name="get_folder_tree">
     <querytext>
Index: openacs-4/packages/file-storage/www/move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/move.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/file-storage/www/move.tcl	3 Nov 2017 15:58:29 -0000	1.12
+++ openacs-4/packages/file-storage/www/move.tcl	15 Mar 2019 09:45:54 -0000	1.12.2.1
@@ -30,7 +30,13 @@
 set not_allowed_parents [list]
 set not_allowed_children [list]
 
-db_multirow -extend {move_message} move_objects get_move_objects "" {
+db_multirow -extend {move_message} move_objects get_move_objects [subst {
+      select fs.object_id, fs.name, fs.type, fs.parent_id,
+      acs_permission.permission_p(fs.object_id, :user_id, 'delete') as move_p
+      from fs_objects fs
+      where fs.object_id in ([template::util::tcl_to_sql_list $object_id])
+	order by move_p
+}] {
     if {$move_p} {
 	set move_message ""
 	incr allowed_count