Index: openacs-4/packages/file-storage/www/file-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-edit-2.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/file-storage/www/file-edit-2.tcl	11 Dec 2003 21:40:04 -0000	1.5
+++ openacs-4/packages/file-storage/www/file-edit-2.tcl	26 May 2004 20:46:33 -0000	1.5.2.1
@@ -20,7 +20,7 @@
 ad_require_permission $file_id write
 
 if [catch {
-    db_exec_plsql rename_file {}
+    db_dml edit_title ""
 } errmsg] {
 
     if { [db_string duplicate_check {}] } {
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/file-edit-2.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/file-storage/www/file-edit-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit-oracle.xql,v
diff -u -r1.2 -r1.2.10.1
--- openacs-4/packages/file-storage/www/file-edit-oracle.xql	22 Sep 2001 05:48:14 -0000	1.2
+++ openacs-4/packages/file-storage/www/file-edit-oracle.xql	26 May 2004 20:46:33 -0000	1.2.10.1
@@ -6,9 +6,10 @@
 <fullquery name="file_info">      
       <querytext>
       
-	select name as title
-	from   cr_items
-	where  item_id = :file_id
+	select title
+	from   cr_revisions, cr_items
+	where  cr_items.item_id = :file_id
+	and revision_id=live_revision
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/file-storage/www/file-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/file-storage/www/file-edit.tcl	18 Jan 2004 14:19:42 -0000	1.6
+++ openacs-4/packages/file-storage/www/file-edit.tcl	26 May 2004 20:46:33 -0000	1.6.2.1
@@ -23,10 +23,7 @@
 
 ad_require_permission $file_id write
 
-db_1row file_info "
-select name as title
-from   cr_items
-where  item_id = :file_id"
+db_1row file_info ""
 
 set context [fs_context_bar_list -final "[_ file-storage.Rename]" $file_id]
 
Index: openacs-4/packages/file-storage/www/file-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-oracle.xql,v
diff -u -r1.10.2.3 -r1.10.2.4
--- openacs-4/packages/file-storage/www/file-oracle.xql	16 May 2004 17:29:28 -0000	1.10.2.3
+++ openacs-4/packages/file-storage/www/file-oracle.xql	26 May 2004 20:46:33 -0000	1.10.2.4
@@ -34,6 +34,7 @@
        		r.revision_id as version_id,
        		person.name(o.creation_user) as author,
        		m.label as pretty_type,
+		i.name,
                 to_char(o.last_modified,'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
        		r.description,
        		acs_permission.permission_p(r.revision_id,:user_id,'admin') as admin_p,
Index: openacs-4/packages/file-storage/www/file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v
diff -u -r1.18.2.2 -r1.18.2.3
--- openacs-4/packages/file-storage/www/file.tcl	16 May 2004 17:29:27 -0000	1.18.2.2
+++ openacs-4/packages/file-storage/www/file.tcl	26 May 2004 20:46:33 -0000	1.18.2.3
@@ -78,6 +78,8 @@
     }
 
 db_multirow -unclobber -extend { last_modified_pretty content_size_pretty version_url version_delete version_delete_url} version version_info {} {
+    # FIXME urlencode each part of the path
+    # set file_url [ad_urlencode $file_url]
     set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi]
     set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x %X"]
     if {$content_size < 1024} {
@@ -95,7 +97,7 @@
     }
     set version_delete [_ file-storage.Delete_Version]
     set version_delete_url "version-delete?[export_vars version_id]"
-    set file_url [ad_urlencode $file_url]
+
 }
 
 set return_url "[ad_conn url]?file_id=$file_id"