@_text@" set template "@_text@" } else { set template "@[join $vars @,@]@
@_text@" } - #my log "USE auto-form template=$template, vars=$vars IA=[$object set instance_attributes], V=[$object info vars] auto [expr {[my exists autoname] ? [my set autoname] : "f"}]" + + #:log "USE auto-form template=$template, vars=$vars \ + # IA=[$object set instance_attributes], \ + # V=[$object info vars] auto [:autoname]" - if {[info exists :auto_form_constraints]} { - set fc [set :auto_form_constraints] - } else { - set fc "" - } set package_id [$object package_id] return [::xowiki::Form new -destroy_on_cleanup \ -package_id $package_id \ -parent_id [$package_id folder_id] \ -name "Auto-Form" \ - -anon_instances [expr {[info exists :autoname] ? [set :autoname] : "f"}] \ + -anon_instances [:autoname] \ -form {} \ -text [list $template text/html] \ - -form_constraints $fc] + -form_constraints [:auto_form_constraints]] } Context instproc form_object {object} { @@ -201,18 +326,20 @@ set loader [:form_loader] # TODO why no procsearch instead of "info methods"? - if {$loader eq "" || [my info methods $loader] eq ""} { - set form_id [my default_load_form_id [[my current_state] form]] + if {$loader eq "" || [:info methods $loader] eq ""} { + set form_id [:default_load_form_id [${:current_state} form]] if {$form_id == 0} { + :log "=== NO default_load_form_id state ${:current_state} form <[${:current_state} form]>" # # When no form was found by the form loader ($form_id == 0) we # create automatically a form. # - set form_object [my create_auto_form $object] + set form_object [:create_auto_form $object] + :log "=== autoform $form_object" } } else { #my msg "using custom form loader $loader for [my form]" - set form_object [my $loader [my form]] + set form_object [my $loader [:form]] } # @@ -226,7 +353,7 @@ && $form_id > 0 } { # just load the object conditionally - if {![my isobject ::$form_id]} { + if {[info commands ::$form_id] eq ""} { ::xo::db::CrClass get_instance_from_db -item_id $form_id } set form_object ::$form_id @@ -265,13 +392,13 @@ -package_id $package_id \ -parent_id [$package_id folder_id] \ -name "Auto-Form" \ - -anon_instances [expr {[my exists autoname] ? [my set autoname] : "f"}] \ + -anon_instances [:autoname] \ -form "" \ -text "" \ -form_constraints ""] } - my set form_id $form_object + set :form_id $form_object } #Context instproc destroy {} { @@ -305,11 +432,11 @@ # - per workflow instance (sub-object of the FormPage) or # - shared based on the revision_id of the workflow definition. # - # Per-instance definition has the advantage of allowing + # Per-instance definitions have the advantage of allowing # e.g. per-object mixins for workflow context definitions, but # this can be costly for complex workflow definitions, e.g. when # multiple workflow instances are created for a single workflow - # definition. + # definition in a request. # #:log START-CREATES if {$::xowf::sharedWorkflowDefinition} { @@ -319,15 +446,38 @@ # We require an xotcl::Object, since the container needs the # method "contains" # - xotcl::Object create ${:wf_container} + :log "=== create WorkflowContainer ${:wf_container}" + WorkflowContainer create ${:wf_container} + :log "=== call create :create_workflow_definition" :create_workflow_definition $workflow_definition #:log "==== def\n$workflow_definition" #:log "==== wf_container children <[${:wf_container} info children]>" } + # + # This is for transitional code. For certain workflows in the + # transition, we can define in the workflow whether or not is + # shall be really shared by setting in the definition the + # variable "shared_definition". + # + set use_shared_definition [${:wf_container} shared_definition] } else { + set use_shared_definition 0 + } + + if {$use_shared_definition == 0} { set :wf_container [self] :create_workflow_definition $workflow_definition #:log [:serialize] + } else { + # + # Evaluate once per request the object-specific code of the + # workflow. + # + set os_code [${:wf_container} object-specific] + if {$os_code ne ""} { + :log "=== ${:object} eval <$os_code>" + ${:object} eval $os_code + } } #:log [:serialize] @@ -387,58 +537,61 @@ :set_current_state initial } - # set the embedded context to the workflow context, + # Set the embedded_context to the workflow context, # used e.g. by "behavior" of form-fields [[$obj package_id] context] set embedded_context [self] set stateObj ${:current_state} catch {$stateObj eval [$stateObj eval_when_active]} - :set_policy $obj - if {[$obj istype ::xowiki::FormPage] && [$obj is_wf_instance]} { + if {[$obj istype ::xowiki::FormPage] && [$obj is_wf_instance]} { # - # The workflow instance may have the following variables: + # The workflow context may have the following variables: # - "debug" # - "policy" # - "autoname" # - "auto_form_constraints" # - "auto_form_template" + # - "shared_definition" # - if {[info exists :debug] && ${:debug} > 0} { + if {[${:wf_container} exists debug] && [${:wf_container} set debug] > 0} { :show_debug_info $obj } - } - #:log "END-initialize_context <$obj>" - } - - Context instproc set_policy {obj} { - if {[info exists :policy]} { - if {![:isobject ${:policy}]} { - :msg "ignore non-existent policy '${:policy}'" - } else { - [$obj package_id] set policy ${:policy} + + if {[${:wf_container} exists policy]} { + set policy [${:wf_container} set policy] + if {![:isobject $policy]} { + :msg "ignore non-existent policy '$policy'" + } else { + [$obj package_id] set policy $policy + } } } + #:log "END-initialize_context <$obj>\n\t context vars: [lsort [:info vars]]\n\tcontainer vars: [lsort [${:wf_container} info vars]]" } + Context instproc show_debug_info {obj} { set form [${:current_state} form] - set view_method [:get_view_method] - set form_loader ${:form_loader} + set view_method [${:current_state} view_method] + set form_loader [${:current_state} form_loader] if {$form eq ""} {set form NONE} if {$view_method eq ""} {set view_method NONE} if {$form_loader eq ""} {set form_loader NONE} $obj debug_msg "State: [${:current_state} name], Form: $form,\ View method: $view_method, Form loader: $form_loader,\ - Context class: [my info class]" + Context class: [:info class]" - set conds [list] - foreach c [:defined Condition] { - lappend conds "[$c name] [$c]" - } - $obj debug_msg "Conditions: [join $conds {, }]" + #set conds [list] + #foreach c [:defined Condition] { + # lappend conds "[$c name] [$c]" + #} + #$obj debug_msg "Conditions: [join $conds {, }]" $obj debug_msg "Instance attributes: [list [$obj instance_attributes]]" + foreach kind {State Action Condition} { + $obj debug_msg "...${kind}s: [lsort [:defined $kind]]" + } } Context instproc draw_arc {from_state next_state action label style} { @@ -460,17 +613,17 @@ set result "" if {[llength $cond_values]>2} { # we have conditional values - set c cond_[$from name]_[my incr condition_count] + set c cond_[$from name]_[incr :condition_count] append arc_style {,style="setlinewidth(1)",penwidth=1,color=gray} append result " state_$c \[shape=diamond, fixedsize=1, width=0.2, height=0.2, fixedsize=1,style=solid,color=gray,label=\"\"\];\n" - append result [my draw_arc [$from name] $c [$action name]-1 $role[$action label] ""] + append result [:draw_arc [$from name] $c [$action name]-1 $role[$action label] ""] foreach {cond value} $cond_values { if {$cond ne ""} {set prefix "$cond"} {set prefix "else"} - append result [my draw_arc $c $value [$action name] \[$prefix\] $arc_style] + append result [:draw_arc $c $value [$action name] \[$prefix\] $arc_style] } } else { set prefix "" - append result [my draw_arc [$from name] [lindex $cond_values 1] [$action name] $role$prefix[$action label] $arc_style] + append result [:draw_arc [$from name] [lindex $cond_values 1] [$action name] $role$prefix[$action label] $arc_style] } return $result } @@ -481,15 +634,15 @@ # final ressort for cases, where ::util::which is not available if {$dot eq "" && [file executable /usr/bin/dot]} {set dot /usr/bin/dot} if {$dot eq ""} {return "Program 'dot' is not available! No graph displayed."} - set obj_id [namespace tail [my object]] + set obj_id [namespace tail ${:object}] set result [subst {digraph workflow_$obj_id \{ dpi = $dpi; node \[shape=doublecircle, margin=0.001, fontsize=8, fixedsize=1, width=0.4, style=filled\]; start; node \[shape=ellipse, fontname="Courier", color=lightblue2, style=filled, fixedsize=0, fontsize=10, margin=0.06\]; edge \[fontname="Courier", fontsize=9\]; }] - foreach s [my defined State] { + foreach s [:defined State] { if {[$s name] eq $current_state} { set color ",color=orange" } elseif {[$s name] in $visited} { @@ -499,24 +652,26 @@ } append result " state_[$s name] \[label=\"[$s label]\"$color\];\n" } - if {[my isobject [self]::initialize]} { - append result "start->state_initial \[label=\"[[self]::initialize label]\"\];\n" + set initializeObj [:wf_definition_object initialize] + if {[my isobject $initializeObj]} { + append result "start->state_initial \[label=\"[$initializeObj label]\"\];\n" } else { append result "start->state_initial;\n" } - my set condition_count 0 - foreach s [my defined State] { + set :condition_count 0 + foreach s [:defined State] { foreach a [$s get_actions -set true] { - append result [my draw_transition $s [self]::$a ""] - set drawn([self]::$a) 1 + set actionObj [:wf_definition_object $a] + append result [:draw_transition $s $actionObj ""] + set drawn($actionObj) 1 } foreach role [$s set handled_roles] { set role_ctx [self]-$role - #my msg exists?role=$role->[self]-$role->[info commands [self]-$role] + #:msg exists?role=$role->[self]-$role->[info commands [self]-$role] if {[info commands ${role_ctx}::[$s name]] ne ""} { foreach a [${role_ctx}::[$s name] get_actions] { - append result [my draw_transition $s ${role_ctx}::$a "$role:"] + append result [:draw_transition $s ${role_ctx}::$a "$role:"] } } } @@ -525,40 +680,41 @@ # State-safe actions might be called from every state. Draw the # arcs if not done yet. # - foreach action [my defined Action] { + foreach action [:defined Action] { if {[info exists drawn($action)]} {continue} if {[$action state_safe]} { - foreach s [my defined State] { - append result [my draw_transition $s $action ""] + foreach s [:defined State] { + append result [:draw_transition $s $action ""] } } } append result "\}\n" - set package_id [[my object] package_id] + set package_id [${:object} package_id] set path [acs_package_root_dir [$package_id package_key]]/www/ set fn $path/g.dot set ofn dot-$obj_id.png set f [open $fn w]; fconfigure $f -encoding utf-8; puts $f $result; close $f if {[catch {exec $dot -Tpng $fn -o $path/$ofn} errorMsg]} { - my msg "Error during execution of $dot: $errorMsg" + :msg "Error during execution of $dot: $errorMsg" } file delete -- $fn return "
$::errorInfo" @@ -1291,10 +1423,10 @@ return "" } else { - # We moved get_next_state here to allow an action to infuence the + # We moved get_next_state here to allow an action to influence the # conditions in the activation method. set next_state [$action_command get_next_state] - ns_log notice "ACTIVATE [my name] no error next-state=$next_state" + ns_log notice "ACTIVATE ${:name} no error next-state=$next_state" return $next_state } } @@ -1304,15 +1436,15 @@ lassign [next] validation_errors category_ids if {$validation_errors == 0} { #my msg "validation ok" - set cc [[my package_id] context] + set cc [[:package_id] context] set ctx [::xowf::Context require [self]] foreach {name value} [$cc get_all_form_parameter] { if {[regexp {^__action_(.+)$} $name _ action]} { set next_state [my activate $ctx $action] #my log "after activate next_state=$next_state, current_state=[$ctx get_current_state], [my set instance_attributes]" if {$next_state ne ""} { if {[${ctx}::$next_state exists assigned_to]} { - my assignee [my get_assignee [${ctx}::$next_state assigned_to]] + :assignee [:get_assignee [${ctx}::$next_state assigned_to]] } $ctx set_current_state $next_state } @@ -1471,15 +1603,15 @@ # the workflow definition. # set ctx [::xowf::Context require [self]] - set wfd [$ctx wf_container] - :activate $wfd allocate + set wfc [$ctx wf_container] + :activate $wfc allocate # # After allocate, the payload might contain "name", "parent_id" # or "m". Using the payload dict has the advantage that it does # not touch the instance variables. # - set payload [${wfd}::allocate payload] + set payload [${wfc}::allocate payload] set m "" foreach p {name parent_id m} { if {[dict exists $payload $p]} { @@ -1647,11 +1779,13 @@ WorkflowPage instproc get_anon_instances {} { if {[my istype ::xowiki::FormPage] && [:is_wf_instance]} { - # In case, the workflow has the autoname variable set, it has - # the highest weight of all other sources. - set ctx [::xowf::Context require [self]] - if {[$ctx exists autoname]} { - return [$ctx set autoname] + # + # In case, the workflow definition has the autoname variable set, + # it has the highest weight of all other sources. + # + set wfc [[::xowf::Context require [self]] wf_container] + if {[$wfc exists autoname]} { + return [$wfc set autoname] } } next @@ -1676,7 +1810,7 @@ where i.item_id = :item_id and r.item_id = i.item_id and xowiki_form_page_id = r.revision_id}] { set visited($state) 1 } - #my msg "visisted states of item $item_id = [array names visited]" + #my msg "visited states of item $item_id = [array names visited]" return [array names visited] } @@ -1937,15 +2071,15 @@ # # In order to provide either a REST or a DAV interface, we have to # switch to basic authentication, since non-OpenACS packages -# have problems to handle OpenACS coockies. The basic authentication -# interface can be establised in three steps: +# have problems to handle OpenACS cookies. The basic authentication +# interface can be established in three steps: # # 1) Create a basic authentication handler, Choose a URL and # define optionally the package to be initialized: # Example: # ::xowf::dav create ::xowf::ba -url /ba -package ::xowf::Package # -# 2) Make sure, the basic authenication handler is initialied during +# 2) Make sure, the basic authentication handler is initialized during # startup. Write an -init.tcl file containing a call to the # created handler. # Example: @@ -2015,7 +2149,7 @@ ad_proc include_get {{-level 1} wfName {vars ""}} { if {![string match "/packages/*/lib/*" $wfName]} { - error "path leading to workflow name must look likw /packages/*/lib/*" + error "path leading to workflow name must look like /packages/*/lib/*" } set fname [get_server_root]$wfName Index: openacs-4/packages/xowf/www/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/index.vuh,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/xowf/www/index.vuh 11 Aug 2017 13:35:48 -0000 1.4 +++ openacs-4/packages/xowf/www/index.vuh 17 Aug 2017 12:04:42 -0000 1.5 @@ -13,14 +13,10 @@ {-folder_id:integer 0} } ::$package_id log "--starting... [ns_conn url] [ns_conn query]" -# form vars = [ns_set array [ns_getform]] - -#::$package_id log "-- [::xo::cc serialize]" - -::xo::profile { - ::$package_id reply_to_user [::$package_id invoke -method $m] -} +# "form vars = [ns_set array [ns_getform]]" +::$package_id reply_to_user [::$package_id invoke -method $m] ::$package_id log "--i ::$package_id DONE" +ad_script_abort # Local variables: # mode: tcl