Index: openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql,v diff -u -r1.7 -r1.7.4.1 --- openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql 17 May 2003 10:37:05 -0000 1.7 +++ openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql 16 May 2004 16:53:06 -0000 1.7.4.1 @@ -78,13 +78,14 @@ case when cr_items.content_type = 'content_folder' then cr_folders.label when cr_items.content_type = 'content_extlink' then cr_extlinks.label - else cr_items.name + else nvl(cr_revisions.title,cr_items.name) end as name, - cr_revisions.title as file_upload_name, + cr_items.name as file_upload_name, acs_objects.last_modified, cr_extlinks.url, cr_items.parent_id, cr_items.name as key, + cr_mime_types.label as pretty_type case when cr_items.content_type = 'content_folder' then 0 else 1 @@ -93,4 +94,5 @@ where cr_items.item_id = cr_extlinks.extlink_id(+) and cr_items.item_id = cr_folders.folder_id(+) and cr_items.item_id = acs_objects.object_id - and cr_items.live_revision = cr_revisions.revision_id(+); + and cr_items.live_revision = cr_revisions.revision_id(+) + and cr_revisions.mime_type = cr_mime_types.mime_type(+); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0d3-5.1.0d4.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql,v diff -u -r1.8 -r1.8.4.1 --- openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql 17 May 2003 10:38:11 -0000 1.8 +++ openacs-4/packages/file-storage/sql/postgresql/file-storage-views-create.sql 16 May 2004 16:53:08 -0000 1.8.4.1 @@ -76,18 +76,23 @@ case when cr_items.content_type = 'content_folder' then cr_folders.label when cr_items.content_type = 'content_extlink' then cr_extlinks.label - else cr_items.name + else coalesce(cr_revisions.title,cr_items.name) end as name, - cr_revisions.title as file_upload_name, + cr_items.name as file_upload_name, + cr_revisions.mime_type, acs_objects.last_modified, cr_extlinks.url, cr_items.parent_id, cr_items.name as key, case when cr_items.content_type = 'content_folder' then 0 else 1 - end as sort_key + end as sort_key, + cr_mime_types.label as pretty_type + from cr_items left join cr_extlinks on (cr_items.item_id = cr_extlinks.extlink_id) + left join cr_folders on (cr_items.item_id = cr_folders.folder_id) left join cr_revisions on (cr_items.live_revision = cr_revisions.revision_id) + left join cr_mime_types on (cr_revisions.mime_type = cr_mime_types.mime_type) join acs_objects on (cr_items.item_id = acs_objects.object_id); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d3-5.1.0d4.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/file-storage/www/folder-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-chunk-oracle.xql,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/file-storage/www/folder-chunk-oracle.xql 25 Mar 2004 02:28:40 -0000 1.8.2.1 +++ openacs-4/packages/file-storage/www/folder-chunk-oracle.xql 16 May 2004 16:53:09 -0000 1.8.2.2 @@ -9,6 +9,7 @@ fs_objects.name, fs_objects.live_revision, fs_objects.type, + fs_objects.pretty_type, to_char(fs_objects.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi, fs_objects.content_size, fs_objects.url, Index: openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql 25 Mar 2004 02:28:40 -0000 1.10.2.1 +++ openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql 16 May 2004 16:53:09 -0000 1.10.2.2 @@ -6,9 +6,11 @@ select fs_objects.object_id, + fs_objects.mime_type, fs_objects.name, fs_objects.live_revision, fs_objects.type, + fs_objects.pretty_type, to_char(fs_objects.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi, fs_objects.content_size, fs_objects.url, 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.8 -r1.21.2.9 --- openacs-4/packages/file-storage/www/folder-chunk.tcl 12 May 2004 02:35:25 -0000 1.21.2.8 +++ openacs-4/packages/file-storage/www/folder-chunk.tcl 16 May 2004 16:53:09 -0000 1.21.2.9 @@ -81,19 +81,20 @@ set elements [list icon \ [list label "" \ - display_template {#file-storage.@contents.type@#}] \ + display_template {#file-storage.@contents.pretty_type@#}] \ name \ [list label [_ file-storage.Name] \ - link_url_col file_url \ + display_template {@contents.name@
@contents.file_upload_name@} \ orderby_desc {fs_objects.name desc} \ orderby_asc {fs_objects.name asc}] \ content_size_pretty \ [list label [_ file-storage.Size] \ orderby_desc {content_size desc} \ orderby_asc {content_size asc}] \ type [list label [_ file-storage.Type] \ - orderby_desc {type desc} \ - orderby_asc {type asc}] \ + display_col pretty_type \ + orderby_desc {(sort_key = 0),pretty_type desc} \ + orderby_asc {sort_key, pretty_type asc}] \ last_modified_pretty \ [list label [_ file-storage.Last_Modified] \ orderby_desc {last_modified_ansi desc} \ @@ -128,13 +129,19 @@ db_multirow -extend { icon last_modified_pretty content_size_pretty properties_link properties_url} contents select_folder_contents {} { 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 {[string equal $type "folder"]} { set content_size_pretty [lc_numeric $content_size] append content_size_pretty " [_ file-storage.items]" + set pretty_type "Folder" } else { - set content_size_pretty [lc_numeric [expr $content_size / 1024 ]] + set type [string trimleft [file extension $file_upload_name] . ] + if {$content_size > 0 && $content_size < 1024} { + set content_size_pretty [lc_numeric 1] + } else { + set content_size_pretty [lc_numeric [expr $content_size / 1024 ]] + } append content_size_pretty " [_ file-storage.kb]" }