Index: openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml 3 Nov 2003 12:52:10 -0000 1.13 +++ openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml 8 Dec 2003 15:12:09 -0000 1.13.2.1 @@ -42,6 +42,7 @@ Der er enten allerede en mappe med navnet "%folder_name%", eller du har klikket p� knappen mere end �n gang. Du kan bruge Tilbage-knappen og v�lge et nyt navn, eller du kan <a href="%directory_url%">vende tilbage til mappeoversigten</a> og se, om din mappe er oprettet d�r. Mappen %folder_name% er tom Der er allerede en fil med det navn i denne mappe. M�ske har du klikket to gange. + Lad titel v�re blank hvis du uploader flere dokumenter med links imellem. �ndr rettighedder for denne fil Rediger rettigheder p� denne mappe Skriv venligst det nye navn for denne fil: Index: openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml 16 Oct 2003 15:19:54 -0000 1.15 +++ openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml 8 Dec 2003 15:12:09 -0000 1.15.2.1 @@ -54,6 +54,7 @@ Either there is already a folder with the name "%folder_name%" or you clicked on the button more than once. You can use the Back button to return and choose a new name, or <a href="%directory_url%">return to the directory listing</a> to see if your folder is there. Folder %folder_name% is empty. It appears that there is already a file with that name in this folder (although possibly you clicked more than once on the submit button.) + Leave title blank when uploading multiple interlinked documents. Live version of "%title%" Modify permissions on this file Modify permissions on this folder Index: openacs-4/packages/file-storage/www/file-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.adp,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/file-storage/www/file-add.adp 22 May 2003 14:55:53 -0000 1.8 +++ openacs-4/packages/file-storage/www/file-add.adp 8 Dec 2003 15:12:09 -0000 1.8.2.1 @@ -8,24 +8,29 @@ - - + + - - + + - - + + - + - + @@ -34,11 +39,19 @@ - - + + + + + + + Index: openacs-4/packages/file-storage/www/file-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-edit-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/file-storage/www/file-edit-2.tcl 5 Nov 2002 17:19:59 -0000 1.4 +++ openacs-4/packages/file-storage/www/file-edit-2.tcl 8 Dec 2003 15:12:09 -0000 1.4.2.1 @@ -19,19 +19,11 @@ ad_require_permission $file_id write -if [catch {db_exec_plsql rename_file " -begin - content_item.rename ( - item_id => :file_id, - name => :title - ); -end;"} errmsg] { +if [catch { + db_exec_plsql rename_file {} +} errmsg] { - if [db_string duplicate_check " - select count(*) - from cr_items - where name = :name - and parent_id = content_item.get_parent_folder(:file_id)"] { + if { [db_string duplicate_check {}] } { ad_return_complaint 1 "[_ file-storage.lt_It_appears_that_there]" } else { ad_return_complaint 1 "[_ file-storage.lt_We_got_an_error_that_] Index: openacs-4/packages/file-storage/www/file-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-oracle.xql,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/file-storage/www/file-oracle.xql 25 Sep 2003 13:55:04 -0000 1.9 +++ openacs-4/packages/file-storage/www/file-oracle.xql 8 Dec 2003 15:12:09 -0000 1.9.2.1 @@ -18,7 +18,8 @@ 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 + acs_permission.permission_p(:file_id,:user_id,'admin') as admin_p, + content_item.get_path(o.object_id, :root_folder_id) as file_url from acs_objects o, cr_revisions r, cr_items i where o.object_id = :file_id and i.item_id = o.object_id Index: openacs-4/packages/file-storage/www/file-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-postgresql.xql,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/file-storage/www/file-postgresql.xql 25 Sep 2003 13:55:04 -0000 1.9 +++ openacs-4/packages/file-storage/www/file-postgresql.xql 8 Dec 2003 15:12:09 -0000 1.9.2.1 @@ -17,7 +17,8 @@ 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 + acs_permission__permission_p(:file_id,:user_id,'admin') as admin_p, + content_item__get_path(o.object_id, :root_folder_id) as file_url from acs_objects o, cr_revisions r, cr_items i where o.object_id = :file_id and i.item_id = o.object_id 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.16 -r1.16.2.1 --- openacs-4/packages/file-storage/www/file.adp 13 Oct 2003 17:16:08 -0000 1.16 +++ openacs-4/packages/file-storage/www/file.adp 8 Dec 2003 15:12:09 -0000 1.16.2.1 @@ -59,8 +59,14 @@ - 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.15 -r1.15.2.1 --- openacs-4/packages/file-storage/www/file.tcl 16 Oct 2003 17:44:55 -0000 1.15 +++ openacs-4/packages/file-storage/www/file.tcl 8 Dec 2003 15:12:09 -0000 1.15.2.1 @@ -34,18 +34,10 @@ set show_administer_permissions_link_p [ad_parameter "ShowAdministerPermissionsLinkP"] -db_1row file_info " -select person.name(o.creation_user) as owner, - i.name, - r.title, - 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 -from acs_objects o, cr_revisions r, cr_items i -where o.object_id = :file_id -and i.item_id = o.object_id -and r.revision_id = i.live_revision" +set root_folder_id [fs::get_root_folder] +db_1row file_info {} + # We use the new db_map here if {[string equal $show_all_versions_p "t"]} { # append sql " Index: openacs-4/packages/file-storage/www/download-archive/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download-archive/index.vuh,v diff -u -r1.4 -r1.4.6.1 --- openacs-4/packages/file-storage/www/download-archive/index.vuh 6 Aug 2002 13:27:15 -0000 1.4 +++ openacs-4/packages/file-storage/www/download-archive/index.vuh 8 Dec 2003 15:12:09 -0000 1.4.6.1 @@ -49,6 +49,7 @@ # get the archive command set cmd [fs::get_archive_command -in_file $file_name -out_file $out_file] +error $cmd # create the archive with_catch errmsg {
#file-storage.Version_filename_#
#file-storage.Version_filename_#
 #file-storage.lt_Use_the_Browse_button#   + [i] + #file-storage.lt_Use_the_Browse_button# +
    
#file-storage.Title# #file-storage.Title# + +
#file-storage.Description#   + [i] + #file-storage.lt_Leave_blank_for_linked_documents# +
#file-storage.Description#
- @version.title@ + + + + @version.title@ + + + @version.title@ + @version.author@ @version.content_size_pretty@