Index: openacs-4/packages/file-storage/www/file-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-delete.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-delete.adp	22 Sep 2001 05:46:56 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="fs_master">
-<property name="title">Delete @file_name@</property>
+<property name="title">Delete @title@</property>
 <property name="context_bar">@context_bar@</property>
 
 <if @blocked_p@ eq "t">
@@ -14,7 +14,7 @@
 <input type=hidden name=file_id value=@file_id@>
 <input type=hidden name=confirmed_p value="t">
 
-<p>Are you sure you want to delete the file "@file_name@" and all of
+<p>Are you sure you want to delete the file "@title@" and all of
 its versions?  This action cannot be reversed.
 
 <p>
Index: openacs-4/packages/file-storage/www/file-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-edit.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-edit.adp	22 Sep 2001 05:48:40 -0000	1.2
@@ -8,7 +8,7 @@
 
 <p>Please enter the new name for this file:
 
-<p><input type=text name="name" value="@name@" size=30>
+<p><input type=text name="title" value="@title@" size=30>
 
 <p><input type=submit value="Change Name">
 
Index: openacs-4/packages/file-storage/www/file-move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-move.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-move.tcl	22 Sep 2001 05:50:43 -0000	1.2
@@ -28,7 +28,7 @@
 
 set file_name [db_exec_plsql file_name "
 begin
-    :1 := content_item.get_title(:file_id);
+    :1 := file_storage.get_title(:file_id);
 end;"]
 
 set context_bar [fs_context_bar_list -final "Move" $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.3 -r1.4
--- openacs-4/packages/file-storage/www/file-oracle.xql	20 Aug 2001 17:31:05 -0000	1.3
+++ openacs-4/packages/file-storage/www/file-oracle.xql	22 Sep 2001 05:51:00 -0000	1.4
@@ -7,9 +7,8 @@
       <querytext>
       
 	select person.name(o.creation_user) as owner,
-       		i.name,
-       		r.title,
-       		content_item.get_path(i.item_id,file_storage.get_root_folder([ad_conn package_id])) as file_path,
+       		i.name as title,
+       		r.title as name,
        		acs_permission.permission_p(:file_id,:user_id,'write') as write_p,
        		acs_permission.permission_p(:file_id,:user_id,'delete') as delete_p,
        		acs_permission.permission_p(:file_id,:user_id,'admin') as admin_p
@@ -25,16 +24,19 @@
 
 	select  r.title,
        		r.revision_id as version_id,
+       		file_storage.get_path(i.item_id,file_storage.get_root_folder([ad_conn package_id]),r.revision_id) as file_path,
        		person.name(o.creation_user) as author,
        		r.mime_type as type,
        		to_char(o.last_modified,'YYYY-MM-DD HH24:MI') as last_modified,
        		r.description,
        		acs_permission.permission_p(r.revision_id,:user_id,'admin') as admin_p,
        		acs_permission.permission_p(r.revision_id,:user_id,'delete') as delete_p,
-       		dbms_lob.getlength(r.content) as content_size
-	from   acs_objects o, cr_revisions r
+       		r.content_length as content_size
+	from   acs_objects o, cr_revisions r, cr_items i
 	where  o.object_id = r.revision_id
 	and    acs_permission.permission_p(r.revision_id, :user_id, 'read') = 't'
+	and    r.item_id = i.item_id
+	and    r.item_id = :file_id
 	$show_versions
 
       </querytext>
@@ -43,15 +45,13 @@
 <partialquery name="show_all_versions">      
       <querytext>
 
-	and r.item_id = :file_id
-
       </querytext>
 </partialquery> 	
 
 <partialquery name="show_live_version">      
       <querytext>
 
-	and r.revision_id = (select live_revision from cr_items where item_id = :file_id)
+	and r.revision_id = i.live_revision
 
       </querytext>
 </partialquery> 	
Index: openacs-4/packages/file-storage/www/file-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/file-postgresql.xql	20 Aug 2001 17:31:14 -0000	1.2
+++ openacs-4/packages/file-storage/www/file-postgresql.xql	22 Sep 2001 05:51:14 -0000	1.3
@@ -7,9 +7,8 @@
       <querytext>
       
 	select person__name(o.creation_user) as owner,
-       		i.name,
-       		r.title,
-       		content_item__get_path(i.item_id,file_storage__get_root_folder([ad_conn package_id])) as file_path,
+       		i.name as title,
+       		r.title as name,
        		acs_permission__permission_p(:file_id,:user_id,'write') as write_p,
        		acs_permission__permission_p(:file_id,:user_id,'delete') as delete_p,
        		acs_permission__permission_p(:file_id,:user_id,'admin') as admin_p
@@ -25,16 +24,19 @@
 
 	select  r.title,
        		r.revision_id as version_id,
+       		file_storage__get_path(i.item_id,file_storage__get_root_folder([ad_conn package_id]),r.revision_id) as file_path,
        		person__name(o.creation_user) as author,
        		r.mime_type as type,
        		to_char(o.last_modified,'YYYY-MM-DD HH24:MI') as last_modified,
        		r.description,
        		acs_permission__permission_p(r.revision_id,:user_id,'admin') as admin_p,
        		acs_permission__permission_p(r.revision_id,:user_id,'delete') as delete_p,
-       		lob_length(r.lob) as content_size
-	from   acs_objects o, cr_revisions r
+       		r.content_length as content_size
+	from   acs_objects o, cr_revisions r, cr_items i
 	where  o.object_id = r.revision_id
 	and    acs_permission__permission_p(r.revision_id, :user_id, 'read') = 't'
+	and    r.item_id = i.item_id
+	and    r.item_id = :file_id
 	$show_versions
 
       </querytext>
@@ -43,15 +45,13 @@
 <partialquery name="show_all_versions">      
       <querytext>
 
-	and r.item_id = :file_id
-
       </querytext>
 </partialquery> 	
 
 <partialquery name="show_live_version">      
       <querytext>
 
-	and r.revision_id = (select live_revision from cr_items where item_id = :file_id)
+	and r.revision_id = i.live_revision
 
       </querytext>
 </partialquery> 	
Index: openacs-4/packages/file-storage/www/file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/file-storage/www/file.adp	22 Sep 2001 05:51:30 -0000	1.2
@@ -4,7 +4,7 @@
 <property name="context_bar">@context_bar@</property>
 
 <ul>
-  <li>File Name: @name@ <if @write_p@ eq "t">(<a href="file-edit?file_id=@file_id@">edit</a>)</if>
+  <li>Title: @title@ <if @write_p@ eq "t">(<a href="file-edit?file_id=@file_id@">edit</a>)</if>
   <li>Owner: @owner@
 <p>
   <li>Actions: 
@@ -38,9 +38,9 @@
    <else>Live version of "@title@"</else></td>
  </tr>
  <tr>
-  <td>Title</td>
+  <td>Version filename</td>
   <td>Author</td>
-  <td>Size</td>
+  <td>Size (bytes)</td>
   <td>Type</td>
   <td>Modified</td>
   <td>Version Notes</td>
@@ -49,9 +49,9 @@
 
 <multiple name=version>
  <tr>
-  <td><img src="graphics/file.gif"><a href="download/@file_path@?version_id=@version.version_id@">@version.title@</a></td>
+  <td><img src="graphics/file.gif"><a href="download/@version.file_path@?version_id=@version.version_id@">@version.title@</a></td>
   <td>@version.author@</td>
-  <td>@version.content_size@ bytes</td>
+  <td align=right>@version.content_size@</td>
   <td>@version.type@</td>
   <td>@version.last_modified@</td>
   <td>@version.description@</td>
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.3 -r1.4
--- openacs-4/packages/file-storage/www/file.tcl	20 Aug 2001 17:30:54 -0000	1.3
+++ openacs-4/packages/file-storage/www/file.tcl	22 Sep 2001 05:51:41 -0000	1.4
@@ -65,11 +65,6 @@
        r.description,
        acs_permission.permission_p(r.revision_id,:user_id,'admin') as admin_p,
        acs_permission.permission_p(r.revision_id,:user_id,'delete') as delete_p,
-       -- JS: For now, we stick to the original version.  According to DanW, we
-       -- JS: should take care of filling up content_length.   Ideally, we want to abstract away 
-       -- JS: the calculation of content_length independent of storage_type, so eventually this
-       -- JS: will just call the content_length attribute
-       dbms_lob.getlength(r.content) as content_size
        r.content_length as content_size
 from   acs_objects o, cr_revisions r
 where  o.object_id = r.revision_id
Index: openacs-4/packages/file-storage/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/index-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/index-oracle.xql	20 Aug 2001 17:30:31 -0000	1.2
+++ openacs-4/packages/file-storage/www/index-oracle.xql	22 Sep 2001 05:55:36 -0000	1.3
@@ -7,12 +7,12 @@
       <querytext>
       
 select i.item_id as file_id,
-       r.title as name,
+       i.name as name,
        i.live_revision,
-       content_item.get_path(i.item_id,file_storage.get_root_folder(:package_id)) as path,
+       file_storage.get_path(i.item_id,file_storage.get_root_folder(:package_id),null) as path,
        r.mime_type as type,
        to_char(o.last_modified,'YYYY-MM-DD HH24:MI') as last_modified,
-       dbms_lob.getlength(r.content) as content_size,
+       r.content_length as content_size,
        1 as ordering_key
 from   cr_items i, cr_revisions r, acs_objects o
 where  i.item_id       = o.object_id
@@ -24,7 +24,7 @@
 select i.item_id as file_id,
        f.label as name,
        0,
-       content_item.get_path(f.folder_id) as path,
+       file_storage.get_path(f.folder_id,null,null) as path,
        'Folder',
        NULL,
        0,
Index: openacs-4/packages/file-storage/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/index-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/index-postgresql.xql	20 Aug 2001 17:30:00 -0000	1.2
+++ openacs-4/packages/file-storage/www/index-postgresql.xql	22 Sep 2001 05:55:54 -0000	1.3
@@ -6,13 +6,12 @@
 <fullquery name="file_select">      
       <querytext>
 	select 	i.item_id as file_id,
-       		r.title as name,
+       		i.name as name,
        		i.live_revision,
-       		content_item__get_path(i.item_id,file_storage__get_root_folder(:package_id)) as path,
+       		file_storage__get_path(i.item_id,file_storage__get_root_folder(:package_id)) as path,
        		r.mime_type as type,
        		to_char(o.last_modified,'YYYY-MM-DD HH24:MI') as last_modified,
-       		-- dbms_lob.getlength(r.content) as content_size,
-	        lob_length(r.lob) as content_size,
+	        r.content_length as content_size,
        		1 as ordering_key
 	from   cr_items i left join cr_revisions r on (i.live_revision = r.revision_id), acs_objects o
 	where  i.item_id       = o.object_id
@@ -23,7 +22,7 @@
 	select 	i.item_id as file_id,
        		f.label as name,
        		0,
-       		content_item__get_path(f.folder_id,null) as path,
+       		file_storage__get_path(f.folder_id,null) as path,
        		'Folder',
        		NULL,
        		0,
Index: openacs-4/packages/file-storage/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/index.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/file-storage/www/index.adp	22 Sep 2001 05:56:08 -0000	1.2
@@ -29,7 +29,7 @@
  <tr>
   <td bgcolor=#cccccc>Name</td>
   <td bgcolor=#cccccc>Action</td>
-  <td bgcolor=#cccccc>Size</td>
+  <td bgcolor=#cccccc>Size (bytes)</td>
   <td bgcolor=#cccccc>Type</td>
   <td bgcolor=#cccccc>Modified</td>
  </tr>
@@ -44,8 +44,8 @@
    <td>&nbsp;</td>
   </if><else>
    <td><img src="graphics/file.gif"><a href="file?file_id=@file.file_id@">@file.name@</a></td>
-   <td><a href="download/@file.path@">(download)</a></td>
-   <td>@file.content_size@</td>
+   <td><a href="download/@file.path@?version_id=@file.live_revision@">(download)</a></td>
+   <td align=right>@file.content_size@</td>
    <td>@file.type@</td>
    <td>@file.last_modified@</td>
   </else>
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/index.tcl	20 Aug 2001 17:30:44 -0000	1.3
+++ openacs-4/packages/file-storage/www/index.tcl	22 Sep 2001 05:56:22 -0000	1.4
@@ -49,11 +49,7 @@
        content_item.get_path(i.item_id,file_storage.get_root_folder(:package_id)) as path,
        r.mime_type as type,
        to_char(o.last_modified,'YYYY-MM-DD HH24:MI') as last_modified,
-       -- JS: For now, we stick to port of the original version.  According to DanW, we
-       -- JS: should take care of filling up content_length.  Ideally, we want to abstract away 
-       -- JS: the calculation of content_length independent of storage_type, so eventually this
-       -- JS: will just call the content_length attribute
-       dbms_lob.getlength(r.content) as content_size,
+       r.content_length as content_size,
        1 as ordering_key
 from   cr_items i, cr_revisions r, acs_objects o
 where  i.item_id       = o.object_id