Index: openacs-4/packages/acs-content-repository/acs-content-repository.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v diff -u -r1.33.2.15 -r1.33.2.16 --- openacs-4/packages/acs-content-repository/acs-content-repository.info 2 Sep 2004 20:18:51 -0000 1.33.2.15 +++ openacs-4/packages/acs-content-repository/acs-content-repository.info 3 Sep 2004 16:05:17 -0000 1.33.2.16 @@ -7,7 +7,7 @@ t t - + Dan Wickstrom The canonical repository for OpenACS content. 2004-04-29 @@ -17,7 +17,7 @@ other CMS backing functionality. Utilized by Bug Tracker, File Storage, and other packages. - + Index: openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql 5 Apr 2004 01:13:52 -0000 1.10.2.1 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql 3 Sep 2004 16:05:18 -0000 1.10.2.2 @@ -68,7 +68,8 @@ revision_id in cr_revisions.revision_id%TYPE default null, creation_date in acs_objects.creation_date%TYPE default sysdate, creation_user in acs_objects.creation_user%TYPE default null, - creation_ip in acs_objects.creation_ip%TYPE default null + creation_ip in acs_objects.creation_ip%TYPE default null, + filename in cr_revisions.filename%TYPE default null ) return cr_revisions.revision_id%TYPE is v_revision_id integer; @@ -89,7 +90,8 @@ revision_id => revision_id, creation_date => creation_date, creation_user => creation_user, - creation_ip => creation_ip + creation_ip => creation_ip, + filename => filename ); select Index: openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql,v diff -u -r1.17.2.1 -r1.17.2.2 --- openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql 26 May 2004 18:50:31 -0000 1.17.2.1 +++ openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql 3 Sep 2004 16:05:18 -0000 1.17.2.2 @@ -855,7 +855,8 @@ revision_id in cr_revisions.revision_id%TYPE default null, creation_date in acs_objects.creation_date%TYPE default sysdate, creation_user in acs_objects.creation_user%TYPE default null, - creation_ip in acs_objects.creation_ip%TYPE default null + creation_ip in acs_objects.creation_ip%TYPE default null, + filename in cr_revisions.filename%TYPE default null ) return cr_revisions.revision_id%TYPE; function copy ( Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.2d8-5.1.2d9.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-content-repository/tcl/revision-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs-oracle.xql,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/acs-content-repository/tcl/revision-procs-oracle.xql 1 Apr 2004 01:20:56 -0000 1.8.2.1 +++ openacs-4/packages/acs-content-repository/tcl/revision-procs-oracle.xql 3 Sep 2004 16:05:19 -0000 1.8.2.2 @@ -115,7 +115,8 @@ item_id => :item_id, revision_id => :revision_id, creation_user => :creation_user, - creation_ip => :creation_ip + creation_ip => :creation_ip, + filename => :ojbect_name ); end; 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.4.6 -r1.7.4.7 --- openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql 1 Sep 2004 19:46:14 -0000 1.7.4.6 +++ openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql 3 Sep 2004 15:58:49 -0000 1.7.4.7 @@ -78,7 +78,7 @@ 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.filename,cr_items.name) end as name, cr_items.name as file_upload_name, cr_revisions.title, Index: openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0a8-5.1.0a9.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0a8-5.1.0a9.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0a8-5.1.0a9.sql 1 Sep 2004 19:46:14 -0000 1.1.2.1 +++ openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0a8-5.1.0a9.sql 3 Sep 2004 15:58:49 -0000 1.1.2.2 @@ -20,7 +20,7 @@ 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.filename,cr_items.name) end as name, cr_items.name as file_upload_name, cr_revisions.title, 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.16 -r1.21.2.17 --- openacs-4/packages/file-storage/www/folder-chunk.tcl 30 Aug 2004 00:05:48 -0000 1.21.2.16 +++ openacs-4/packages/file-storage/www/folder-chunk.tcl 3 Sep 2004 15:58:49 -0000 1.21.2.17 @@ -84,7 +84,7 @@ display_template {#file-storage.@contents.pretty_type@#}] \ name \ [list label [_ file-storage.Name] \ - display_template {@contents.name@
@contents.title@} \ + display_template {@contents.name@@contents.title@
@contents.name@} \ orderby_desc {fs_objects.name desc} \ orderby_asc {fs_objects.name asc}] \ content_size_pretty \