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.1 -r1.2
--- openacs-4/packages/file-storage/www/file.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/file-storage/www/file.tcl	16 Aug 2001 20:34:11 -0000	1.2
@@ -45,6 +45,17 @@
 and    i.item_id   = o.object_id
 and    r.revision_id = i.live_revision"
 
+# We use the new db_map here
+if {[string equal $show_all_versions_p "t"]} {
+#    append sql "
+#and r.item_id = :file_id"
+    set show_versions [db_map show_all_versions]
+} else {
+#    append sql "
+#and r.revision_id = (select live_revision from cr_items where item_id = :file_id)"
+    set show_versions [db_map show_live_version]
+}
+
 set sql "
 select r.title,
        r.revision_id as version_id,
@@ -54,20 +65,13 @@
        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
+       -- 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
-and    acs_permission.permission_p(r.revision_id, :user_id, 'read') = 't'"
+and    acs_permission.permission_p(r.revision_id, :user_id, 'read') = 't'
+$show_versions"
 
-
-if {[string equal $show_all_versions_p "t"]} {
-    append sql "
-and r.item_id = :file_id"
-} else {
-    append sql "
-and r.revision_id = (select live_revision from cr_items where item_id = :file_id)"
-}
-
 db_multirow version version_info $sql
 
 ad_return_template
\ No newline at end of file