Index: openacs-4/packages/cms/tcl/form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs.tcl,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/cms/tcl/form-procs.tcl 20 Aug 2001 04:35:41 -0000 1.12 +++ openacs-4/packages/cms/tcl/form-procs.tcl 25 Aug 2001 14:20:31 -0000 1.13 @@ -881,6 +881,7 @@ # if it is HTML then strip out the body set mime_type [ns_guesstype $filename] + ns_log Notice "guessed mime_type: $mime_type, filename = $filename" if { [string equal $mime_type text/html] } { set text [template::util::read_file $tmpfile] if { [regexp {]*>(.*?)} $text x body] } { @@ -920,15 +921,17 @@ returning content into :1" -blob_files [list $tmpfile] } + # this seems to abort the transaction even with the catch. + # update mime_type to match the file - if { [catch {db_dml update_mime_type " - update cr_revisions - set mime_type = :mime_type - where revision_id = :revision_id"} errmsg] } { - # if it fails, use user submitted mime_type - ns_log notice "form-procs - add_revision_dml - using user mime_type - instead of guessed mime type = $mime_type" - } +# if { [catch {db_dml update_mime_type " +# update cr_revisions +# set mime_type = :mime_type +# where revision_id = :revision_id"} errmsg] } { +# # if it fails, use user submitted mime_type +# ns_log notice "form-procs - add_revision_dml - using user mime_type +# instead of guessed mime type = $mime_type" +# } # delete the tempfile ns_unlink $tmpfile Index: openacs-4/packages/cms/tcl/workflow-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/workflow-procs-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cms/tcl/workflow-procs-oracle.xql 24 Aug 2001 14:58:13 -0000 1.2 +++ openacs-4/packages/cms/tcl/workflow-procs-oracle.xql 25 Aug 2001 14:20:31 -0000 1.3 @@ -3,6 +3,54 @@ oracle8.1.6 + + + + begin + :1 := acs_mail_nt.post_request( + party_from => :user_id, + party_to => :party_id, + expand_group => 'f', + subject => :subject, + message => :message + ); + end; + + + + + + + + begin + :1 := acs_mail_nt.post_request( + party_from => -1, + party_to => :admin_id, + expand_group => 'f', + subject => :subject, + message => :message + ); + end; + + + + + + + + begin + :1 := acs_mail_nt.post_request( + party_from => -1, + party_to => :admin_id, + expand_group => 'f', + subject => :subject, + message => :message + ); + end; + + + + Index: openacs-4/packages/cms/tcl/workflow-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/workflow-procs-postgresql.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cms/tcl/workflow-procs-postgresql.xql 24 Aug 2001 14:58:13 -0000 1.3 +++ openacs-4/packages/cms/tcl/workflow-procs-postgresql.xql 25 Aug 2001 14:20:31 -0000 1.4 @@ -3,6 +3,47 @@ postgresql7.1 + + + + + select acs_mail_nt__post_request( + :user_id, + :party_id, + :subject, + :message + ); + + + + + + + + select acs_mail_nt__post_request( + -1, + :admin_id, + :subject, + :message + ); + + + + + + + + select acs_mail_nt__post_request( + -1, + :admin_id, + :subject, + :message + ); + + + + +