Commit f48eb22c authored by Frank Bergmann's avatar Frank Bergmann

- WIP

parent f7ace4ae
......@@ -14,6 +14,9 @@
create extension pgcrypto;
alter table fs_files add column sha1 text;
-----------------------------------------------------------
......
......@@ -11,6 +11,9 @@ ad_page_contract {
upload_file.tmpfile:tmpfile,optional
{ title "" }
{ description "description" }
{ creation_date "" }
{ modification_date "" }
{ sha1 "" }
}
set user_id [ad_conn user_id]
......@@ -20,13 +23,10 @@ set package_id [db_string package "select min(package_id) from apm_packages wher
ns_log Notice "upload: project_id=$project_id, path=$path, upload_file=$upload_file, tmp_file=${upload_file.tmpfile}"
set ttt {
set max_bytes [parameter::get -parameter "MaximumFileSize"]
if {$n_bytes > $max_bytes } {
ad_return_complaint 1 "Your file is larger than the maximum file size allowed on this system ([util_commify_number $max_bytes] bytes)"
ad_script_abort
}
set max_bytes [parameter::get_from_package_key -package_key "file-storage" -parameter "MaximumFileSize"]
if {$n_bytes > $max_bytes } {
doc_return 507 "application/json" "{success: false, message: \"File is larger than the maximum size ($max_bytes bytes) allowed on this server\"}"
ad_script_abort
}
set folder_id [im_rest_fs_folder_for_path -object_id $project_id -path $path]
......@@ -40,8 +40,8 @@ set mime_type [cr_filename_to_mime_type -create -- $upload_file]
set file_id [db_nextval "acs_object_id_seq"]
ns_log Notice "upload: folder_id=$folder_id, file_id=$file_id, mime_type=$mime_type"
if {1} {
fs::add_file \
set file_id [fs::add_file \
-name $upload_file \
-item_id $file_id \
-parent_id $folder_id \
......@@ -51,14 +51,12 @@ if {1} {
-title $upload_file \
-description $description \
-package_id $package_id \
-mime_type $mime_type
}
file delete ${upload_file.tmpfile}
-mime_type $mime_type \
]
ns_log Notice "upload: Finished"
file delete ${upload_file.tmpfile}
doc_return 200 "text/plain" "project_id=$project_id, path=$path, file_id=$file_id, folder_id=$folder_id, upload_file=$upload_file, tmp_file=${upload_file.tmpfile}, cont="
doc_return 200 "application/json" "{success: true, message: \"Upload successful.\", data: {id: $file_id}}"
ad_script_abort
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment