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.2 -r1.10.2.3 --- openacs-4/packages/file-storage/www/file-oracle.xql 16 May 2004 17:24:35 -0000 1.10.2.2 +++ openacs-4/packages/file-storage/www/file-oracle.xql 16 May 2004 17:29:28 -0000 1.10.2.3 @@ -38,7 +38,7 @@ 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, - r.content_length as content_size + nvl(r.content_length,0) as content_size from acs_objects o, cr_revisions r, cr_items i, cr_mime_types m where o.object_id = r.revision_id 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.11.2.1 -r1.11.2.2 --- openacs-4/packages/file-storage/www/file-postgresql.xql 16 May 2004 17:24:35 -0000 1.11.2.1 +++ openacs-4/packages/file-storage/www/file-postgresql.xql 16 May 2004 17:29:28 -0000 1.11.2.2 @@ -37,7 +37,7 @@ 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, - r.content_length as content_size + coalesce(r.content_length,0) as content_size from acs_objects o, cr_items i,cr_revisions r left join cr_mime_types m on r.mime_type=m.mime_type where o.object_id = r.revision_id 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.1 -r1.18.2.2 --- openacs-4/packages/file-storage/www/file.tcl 16 May 2004 17:24:35 -0000 1.18.2.1 +++ openacs-4/packages/file-storage/www/file.tcl 16 May 2004 17:29:27 -0000 1.18.2.2 @@ -80,7 +80,7 @@ db_multirow -unclobber -extend { last_modified_pretty content_size_pretty version_url version_delete version_delete_url} version version_info {} { 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 > 0 && $content_size < 1024} { + if {$content_size < 1024} { set content_size_pretty "[lc_numeric $content_size] [_ file-storage.bytes]" } else { set content_size_pretty "[lc_numeric [expr $content_size / 1024 ]] [_ file-storage.kb]" Index: openacs-4/packages/file-storage/www/folder-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v diff -u -r1.21.2.10 -r1.21.2.11 --- openacs-4/packages/file-storage/www/folder-chunk.tcl 16 May 2004 17:24:35 -0000 1.21.2.10 +++ openacs-4/packages/file-storage/www/folder-chunk.tcl 16 May 2004 17:29:27 -0000 1.21.2.11 @@ -137,7 +137,7 @@ set pretty_type "Folder" } else { set type [string trimleft [file extension $file_upload_name] . ] - if {$content_size > 0 && $content_size < 1024} { + if {$content_size < 1024} { set content_size_pretty "[lc_numeric $content_size] [_ file-storage.bytes]" } else { set content_size_pretty "[lc_numeric [expr $content_size / 1024 ]] [_ file-storage.kb]"