Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs-oracle.xql	27 Sep 2002 15:03:52 -0000	1.1.2.1
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="cr_delete_scheduled_files.fetch_paths">      
+      <querytext>
+
+select distinct crftd.path storage_area_key
+          from cr_files_to_delete crftd
+           and not exists (select 1 
+                             from cr_revisions r 
+                            where r.filename = crftd.path) 
+      </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl,v
diff -u -N -r1.1 -r1.1.4.1
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl	27 Sep 2001 22:48:16 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl	27 Sep 2002 15:02:06 -0000	1.1.4.1
@@ -17,21 +17,15 @@
 } {
      db_transaction {
 	# subselect makes sure there isn't a parent revision still lying around
-	db_foreach fetch_paths {
+	db_foreach fetch_paths "" {
 
-        select distinct crftd.path storage_area_key
-          from cr_files_to_delete crftd
-           and not exists (select 1 
-                             from cr_revisions r 
-                            where r.content = crftd.path) 
-         } {
              # try to remove file from filesystem
              set file "[cr_fs_path $storage_area_key]/${path}"
              ns_log Debug "cr_delete_scheduled_files: deleting $file"
              ns_unlink  -nocomplain "$file"
 	}
 	# now that all scheduled files deleted, clear table
-	db_dml delete_files "delete from cr_files_to_delete"
+	db_dml delete_files ""
     }
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.xql,v
diff -u -N -r1.1 -r1.1.4.1
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.xql	27 Sep 2001 22:48:16 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.xql	27 Sep 2002 15:02:06 -0000	1.1.4.1
@@ -1,15 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="cr_delete_scheduled_files.fetch_paths">      
-      <querytext>
-      select distinct crftd.path, crftd.storage_area_key
-	  from cr_files_to_delete crftd
-	  where not exists (select 1 from cr_revisions r where r.content = crftd.path)
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="cr_delete_scheduled_files.delete_files">      
       <querytext>
       delete from cr_files_to_delete