Index: openacs-4/packages/file-storage/www/file-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-add-2.tcl,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/file-storage/www/file-add-2.tcl 14 Oct 2003 13:53:29 -0000 1.13
+++ openacs-4/packages/file-storage/www/file-add-2.tcl 9 Dec 2003 09:19:05 -0000 1.13.2.1
@@ -8,83 +8,117 @@
folder_id:integer,notnull
upload_file:notnull,trim
upload_file.tmpfile:tmpfile
- title:trim
+ {title:trim ""}
description
+ {unpack_p:boolean "f"}
} -validate {
valid_folder -requires {folder_id:integer} {
- if ![fs_folder_p $folder_id] {
- ad_complain "[_ file-storage.lt_The_specified_parent_]"
- }
+ if ![fs_folder_p $folder_id] {
+ ad_complain "[_ file-storage.lt_The_specified_parent_]"
+ }
}
max_size -requires {upload_file} {
- set n_bytes [file size ${upload_file.tmpfile}]
- set max_bytes [ad_parameter "MaximumFileSize"]
- if { $n_bytes > $max_bytes } {
- ad_complain [_ file-storage.lt_Your_file_is_larger_t_1] [list max_number_of_bytes [util_commify_number $max_bytes]]]
- }
+ set n_bytes [file size ${upload_file.tmpfile}]
+ set max_bytes [ad_parameter "MaximumFileSize"]
+ if { $n_bytes > $max_bytes } {
+ ad_complain [_ file-storage.lt_Your_file_is_larger_t_1] [list max_number_of_bytes [util_commify_number $max_bytes]]]
+ }
}
}
# Check for write permission on this folder
ad_require_permission $folder_id write
-# Get the filename part of the upload file
-if { ![regexp {[^//\\]+$} $upload_file filename] } {
- # no match
- set filename $upload_file
-}
-
-# Get the title
-if { [empty_string_p $title] } {
- set title $filename
-}
-
# Get the user
set user_id [ad_conn user_id]
# Get the ip
set creation_ip [ad_conn peeraddr]
-set mime_type [cr_filename_to_mime_type -create $upload_file]
-
# Get the storage type
set indb_p [ad_parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]]
+set unpack_p [template::util::is_true $unpack_p]
+set unzip_binary [string trim [parameter::get -parameter UnzipBinary]]
+
+if { $unpack_p && ![empty_string_p $unzip_binary] } {
+
+ set path [ns_tmpnam]
+ file mkdir $path
+
+
+ catch { exec $unzip_binary -jd $path ${upload_file.tmpfile} } errmsg
+
+ # More flexible parameter design could be:
+ # zip {unzip -jd {out_path} {in_file}} tar {tar xf {in_file} {out_path}} tgz {tar xzf {in_file} {out_path}}
+
+ set upload_files [list]
+ set upload_tmpfiles [list]
+
+ foreach file [glob -nocomplain "$path/*"] {
+ lappend upload_files [file tail $file]
+ lappend upload_tmpfiles $file
+ }
+
+} else {
+ set upload_files [list $upload_file]
+ set upload_tmpfiles [list ${upload_file.tmpfile}]
+}
+
db_transaction {
- # create the new item
- if {$indb_p} {
+ foreach upload_file $upload_files tmpfile $upload_tmpfiles {
- set file_id [db_exec_plsql new_lob_file {}]
+ set mime_type [cr_filename_to_mime_type -create $upload_file]
+
+ # Get the filename part of the upload file
+ if { ![regexp {[^//\\]+$} $upload_file filename] } {
+ # no match
+ set filename $upload_file
+ }
- set version_id [db_exec_plsql new_version {}]
+ # Get the title
+ if { [empty_string_p $title] || $unpack_p } {
+ set title $filename
+ }
- db_dml lob_content {} -blob_files [list ${upload_file.tmpfile}]
+ # create the new item
+ if {$indb_p} {
- # Unfortunately, we can only calculate the file size after the lob is uploaded
- db_dml lob_size {}
+ set file_id [db_exec_plsql new_lob_file {}]
+
+ set version_id [db_exec_plsql new_version {}]
- } else {
+ db_dml lob_content {} -blob_files [list $tmpfile]
- set file_id [db_exec_plsql new_fs_file {}]
+ # Unfortunately, we can only calculate the file size after the lob is uploaded
+ db_dml lob_size {}
+ } else {
- set version_id [db_exec_plsql new_version {}]
+ set file_id [db_exec_plsql new_fs_file {}]
- set tmp_filename [cr_create_content_file $file_id $version_id ${upload_file.tmpfile}]
- set tmp_size [cr_file_size $tmp_filename]
- db_dml fs_content_size {}
+ set version_id [db_exec_plsql new_version {}]
- }
+ set tmp_filename [cr_create_content_file $file_id $version_id $tmpfile]
+ set tmp_size [cr_file_size $tmp_filename]
- # We know the user has write permission to this folder, but they may not have admin privileges.
- # They should always be able to admin their own file by default, so they can delete it, control
- # who can read it, etc.
+ db_dml fs_content_size {}
- if { [string is false [permission::permission_p -party_id $user_id -object_id $folder_id -privilege admin]] } {
- permission::grant -party_id $user_id -object_id $file_id -privilege admin
+ }
+
+ # We know the user has write permission to this folder, but they may not have admin privileges.
+ # They should always be able to admin their own file by default, so they can delete it, control
+ # who can read it, etc.
+
+ if { [string is false [permission::permission_p -party_id $user_id -object_id $folder_id -privilege admin]] } {
+ permission::grant -party_id $user_id -object_id $file_id -privilege admin
+ }
+
+ # So we'll set the title from the filename in the next iteration
+ set title {}
}
} on_error {
@@ -96,11 +130,11 @@
# from cr_items
# where name = :filename
# and parent_id = :folder_id"] {
-# ad_return_complaint 1 "Either there is already a file with the name \"$tmp_filename\" or you clicked on the button more than once. You can use the Back button to return and choose a new name, or return to the directory listing to see if your file is there."
+# ad_return_complaint 1 "Either there is already a file with the name \"$tmp_filename\" or you clicked on the button more than once. You can use the Back button to return and choose a new name, or return to the directory listing to see if your file is there."
# } else {
-# ad_return_complaint 1 "We got an error that we couldn't readily identify. Please let the system owner know about this.
+# ad_return_complaint 1 "We got an error that we couldn't readily identify. Please let the system owner know about this.
#
-# $errmsg
"
+# $errmsg
"
# }
set folder_name "[_ file-storage.folder]"