Index: openacs-4/packages/simulation/www/simplay/document-upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/document-upload.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/www/simplay/document-upload.tcl	16 Jan 2004 10:20:39 -0000	1.6
+++ openacs-4/packages/simulation/www/simplay/document-upload.tcl	21 Jan 2004 11:17:34 -0000	1.7
@@ -20,62 +20,14 @@
     lappend role_options [list [workflow::role::get_element -role_id $one_role_id -element pretty_name] $one_role_id]
 }
 
-ad_form -name document -export { case_id role_id workflow_id } -html {enctype multipart/form-data} -form {
-    {item_id:key}
-}
-
 set focus "document.document_file"
 
-ad_form -extend -name document -form {
-    {document_file:file(file)
-        {label "Document file"}
-    }
-    {title:text(text)
-        {label "Title"}
-        {html {size 50}}
-    }
-    {description:text(textarea),optional
-        {label "Description"}
-        {html {cols 60 rows 8}}
-    }
-} -on_submit {
+ad_form -name document -export { case_id role_id workflow_id } -html {enctype multipart/form-data} \
+    -form [simulation::ui::forms::document_upload::form_block] \
+    -on_submit {
 
-    db_transaction {
+        simulation::ui::forms::document_upload::insert_document \
+            $case_id $role_id $item_id $document_file $title $description
 
-        set parent_id [bcms::folder::get_id_by_package_id -parent_id 0]
-
-        set existing_items [db_list select_items { select name from cr_items where parent_id = :parent_id }]
-        set name [util_text_to_url -existing_urls $existing_items -text $title]
-
-        set content_type sim_prop
-        set storage_type file
-
-        set item_id [bcms::item::create_item \
-                         -item_id $item_id \
-                         -item_name $name \
-                         -parent_id $parent_id \
-                         -content_type $content_type \
-                         -storage_type $storage_type]
-        
-        set revision_id [bcms::revision::upload_file_revision \
-                             -item_id $item_id \
-                             -title $title \
-                             -content_type $content_type \
-                             -upload_file $document_file \
-                             -description $description]
-
-        bcms::revision::set_revision_status \
-            -revision_id $revision_id \
-            -status "live"
-
-        set relation_tag "portfolio"
-        db_dml add_document_to_portfolio {
-            insert into sim_case_role_object_map
-            (case_id, object_id, role_id, relation_tag)
-            values
-            (:case_id, :item_id, :role_id, :relation_tag)
-        }
+        ad_returnredirect [export_vars -base case { case_id role_id }]
     }
-    
-    ad_returnredirect [export_vars -base case { case_id role_id }]
-}