Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/xowiki/tcl/chat-procs.tcl	14 Mar 2018 15:40:49 -0000	1.25
+++ openacs-4/packages/xowiki/tcl/chat-procs.tcl	9 Apr 2018 07:58:06 -0000	1.26
@@ -34,14 +34,14 @@
   Chat proc initialize_nsvs {} {;}      ;# noop
 
   Chat proc login {-chat_id -package_id {-mode ""} {-path ""}} {
-    #my log "--chat"
+    #:log "--chat"
     if {![ns_conn isconnected]} return
     auth::require_login
     if {![info exists package_id]} {set package_id [ad_conn package_id] }
     if {![info exists chat_id]}    {set chat_id $package_id }
     set session_id [ad_conn session_id].[clock seconds]
     set context id=$chat_id&s=$session_id
-    #my log "chat_id=$chat_id, path=$path"
+    #:log "chat_id=$chat_id, path=$path"
     if {$path eq ""} {
       set path [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]
     } elseif {[string index $path end] ne "/"} {
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.262 -r1.263
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	7 Apr 2018 18:03:18 -0000	1.262
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	9 Apr 2018 07:58:06 -0000	1.263
@@ -95,7 +95,7 @@
         }
       }
     }
-    #my msg not-found-$object-$name
+    #:msg not-found-$object-$name
     return ""
   }
 
@@ -130,13 +130,13 @@
   FormField instproc validate {obj} {
     # use the 'value' method to deal e.g. with compound fields
     set value [:value]
-    #my msg "[:info class] value=$value req=${:required} // ${:value} //"
+    #:msg "[:info class] value=$value req=${:required} // ${:value} //"
 
     if {${:required} && $value eq "" && ![:istype ::xowiki::formfield::hidden]} {
       return [_ acs-templating.Element_is_required [list label ${:label}]]
     }
     #
-    #my msg "++ ${:name} [:info class] validator=[:validator] ([llength [:validator]]) value=$value"
+    #:msg "++ ${:name} [:info class] validator=[:validator] ([llength [:validator]]) value=$value"
     foreach validator [:validator] {
       set errorMsg ""
       #
@@ -145,21 +145,21 @@
       set success 1
       set validator_method check=$validator
       set proc_info [:procsearch $validator_method]
-      #my msg "++ ${:name}: field-level validator exists '$validator_method' ? [expr {$proc_info ne {}}]"
+      #:msg "++ ${:name}: field-level validator exists '$validator_method' ? [expr {$proc_info ne {}}]"
       if {$proc_info ne ""} {
         # we have a slot checker, call it
-        #my msg "++ call-field level validator $validator_method '$value'"
+        #:msg "++ call-field level validator $validator_method '$value'"
         set success [:validation_check $validator_method $value]
       }
       if {$success == 1} {
         # the previous check was ok, check now for a validator on the
         # object level
         set validator_method validate=$validator
         set proc_info [$obj procsearch $validator_method]
-        #my msg "++ ${:name}: page-level validator exists ? [expr {$proc_info ne {}}]"
+        #:msg "++ ${:name}: page-level validator exists ? [expr {$proc_info ne {}}]"
         if {$proc_info ne ""} {
           set success [$obj $validator_method $value]
-          #my msg "++ call page-level validator $validator_method '$value' returns $success"
+          #:msg "++ call page-level validator $validator_method '$value' returns $success"
         }
       }
       if {$success == 0} {
@@ -168,7 +168,7 @@
         # a message key based on the class and the name of the validator.
         #
         set cl [namespace tail [lindex $proc_info 0]]
-        #my msg "__langPkg?[info exists __langPkg]"
+        #:msg "__langPkg?[info exists __langPkg]"
         if {![info exists __langPkg]} {set __langPkg "xowiki"}
         #ns_log notice "calling $__langPkg.$cl-validate_$validator with [list value $value errorMsg $errorMsg] on level [info level] -- [lsort [info vars]]"
         return [_ $__langPkg.$cl-validate_$validator [list value $value errorMsg $errorMsg]]
@@ -189,7 +189,7 @@
       :unset per_object_behavior
     }
 
-    #my msg "reset along [:info precedence]"
+    #:msg "reset along [:info precedence]"
     foreach c [:info precedence] {
       if {$c eq "::xowiki::formfield::FormField"} break
       foreach s [$c info slots] {
@@ -242,7 +242,7 @@
     if {[:ismixin $m]} {my mixin delete $m}
   }
   FormField instproc set_disabled {disable} {
-    #my msg "${:name} set disabled $disable"
+    #:msg "${:name} set disabled $disable"
     if {$disable} {
       set :disabled true
     } else {
@@ -261,7 +261,7 @@
     if {[$pkgctx exists embedded_context]} {
       set ctx [$pkgctx set embedded_context]
       set classname ${ctx}::$mixin
-      #my msg ctx=$ctx-viewer=$mixin,found=[:isclass $classname]
+      #:msg ctx=$ctx-viewer=$mixin,found=[:isclass $classname]
       # TODO: search different places for the mixin. Special namespace?
       if {[:isclass $classname]} {
         if {[info exists :per_object_behavior]} {
@@ -326,10 +326,10 @@
           :class ::xowiki::formfield::$s
           :remove_omit
           if {$old_class ne [:info class]} {
-            #my msg "${:name}: reset class from $old_class to [:info class]"
+            #:msg "${:name}: reset class from $old_class to [:info class]"
             :reset_parameter
             set :__state reset
-            #my log "INITIALIZE ${:name} due to reclassing old $old_class to new [:info class]"
+            #:log "INITIALIZE ${:name} due to reclassing old $old_class to new [:info class]"
             :initialize
           }
         } else {
@@ -343,7 +343,7 @@
   }
 
   FormField instproc config_from_spec {spec} {
-    #my log "config_from_spec ${:name} spec <$spec> [:info class] [[:info class] exists abstract]"
+    #:log "config_from_spec ${:name} spec <$spec> [:info class] [[:info class] exists abstract]"
     if {[[:info class] exists abstract]} {
       # had earlier here: [:info class] eq [self class]
       # Check, whether the actual class is a concrete class (mapped to
@@ -363,17 +363,17 @@
       :interprete_single_spec [FormField fc_decode $s]
     }
 
-    #my msg "${:name}: after specs"
+    #:msg "${:name}: after specs"
     set :__state after_specs
-    #my log "INITIALIZE ${:name} due to config_from_spec"
+    #:log "INITIALIZE ${:name} due to config_from_spec"
     :initialize
 
     #
     # It is possible, that a default value of a form field is changed through a spec.
     # Since only the configuration might set values, checking value for "" seems safe here.
     #
     if {[:value] eq "" && [info exists :default] && ${:default} ne ""} {
-      #my msg "+++ reset value to [:default]"
+      #:msg "+++ reset value to [:default]"
       :value ${:default}
     }
 
@@ -588,7 +588,7 @@
   }
 
   FormField instproc pretty_value {v} {
-    #my log "mapping $v"
+    #:log "mapping $v"
     return [string map [list & "&amp;" < "&lt;" > "&gt;" \" "&quot;" ' "&#39;" @ "&#64;"] $v]
   }
 
@@ -645,7 +645,7 @@
   }
 
   FormField instproc answer_is_correct {} {
-    #my msg "${:name} ([:info class]): value=[:value], answer=[expr {[info exists :answer]?${:answer}:{NONE}}]"
+    #:msg "${:name} ([:info class]): value=[:value], answer=[expr {[info exists :answer]?${:answer}:{NONE}}]"
     if {[info exists :correct_when]} {
       set op [lindex [:correct_when] 0]
       if {[:procsearch answer_check=$op] ne ""} {
@@ -657,7 +657,7 @@
     } elseif {![info exists :answer]} {
       return 0
     } elseif {[:value] ne [:answer]} {
-      #my msg "v='[:value]' NE a='[:answer]'"
+      #:msg "v='[:value]' NE a='[:answer]'"
       return -1
     } else {
       return 1
@@ -817,7 +817,7 @@
     } else {
       set objName file:${:name}
     }
-    #my log ENTRY_INFO=[list name $objName parent_id [${:object} item_id]]
+    #:log ENTRY_INFO=[list name $objName parent_id [${:object} item_id]]
     return [list name $objName parent_id [${:object} item_id]]
   }
 
@@ -895,7 +895,7 @@
       #
       # File entry exists already, create a new revision
       #
-      #my msg "new revision (value $file_name)"
+      #:msg "new revision (value $file_name)"
       $file_object set import_file $tmpfile
       $file_object set mime_type $content_type
       $file_object set title $file_name
@@ -905,7 +905,7 @@
       #
       # Create a new file
       #
-      #my msg "new file"
+      #:msg "new file"
       set package_id [${:object} package_id]
       set file_object [::xowiki::File new -destroy_on_cleanup \
                            -title $file_name \
@@ -935,7 +935,7 @@
       ${:object} set_property -new 1 ${:name} [:get_old_value]
       return
     }
-    #my log "${:name}: got value '${:value}'"
+    #:log "${:name}: got value '${:value}'"
     #${:object} set_property -new 1 ${:name} ${:value}
 
     set package_id [${:object} package_id]
@@ -1007,7 +1007,7 @@
 
         array set "" [${:object} item_ref -default_lang [${:object} lang] -parent_id $(parent_id) $object_name]
 
-        #my log "name <$object_name> pretty value name '$(stripped_name)'"
+        #:log "name <$object_name> pretty value name '$(stripped_name)'"
 
         set l [::xowiki::Link new -destroy_on_cleanup \
                    -page ${:object} -type "file" -lang $(prefix) \
@@ -1047,7 +1047,7 @@
           object_name $entry_info(name) \
           revision_id [:get_from_value ${:value} revision_id ""] \
           fn $fns {
-            #my msg "${:name}: [list :get_from_value <${:value}> name] => '$fn'"
+            #:msg "${:name}: [list :get_from_value <${:value}> name] => '$fn'"
             set href [$package_id pretty_link -download 1 -parent_id $entry_info(parent_id) $object_name]
 
             if {![:istype image]} {
@@ -1627,7 +1627,7 @@
     foreach p [list rows cols style] {if {[info exists :$p]} {set :html($p) [my $p]}}
     if {![:istype ::xowiki::formfield::richtext] && [info exists :editor]} {
       # downgrading
-      #my msg "downgrading [:info class]"
+      #:msg "downgrading [:info class]"
       foreach m [:info mixin] {if {[$m exists editor_mixin]} {my mixin delete $m}}
       foreach v {editor options} {if {[info exists :$v]} {my unset $v}}
     }
@@ -1686,7 +1686,7 @@
     #
     # TODO: this should be made a slot setting
     #
-    #my msg "setting editor for ${:name}, args=$args,[llength $args]"
+    #:msg "setting editor for ${:name}, args=$args,[llength $args]"
     if {[llength $args] == 0} {return ${:editor}}
     set editor [lindex $args 0]
     if {[info exists :editor] && $editor eq ${:editor} && [info exists :__initialized]} return
@@ -1704,7 +1704,7 @@
       }
       foreach m [:info mixin] {if {[$m exists editor_mixin]} {my mixin delete $m}}
       :mixin add $editor_class
-      #my msg "MIXIN $editor: [:info precedence]"
+      #:msg "MIXIN $editor: [:info precedence]"
       :reset_parameter
       set :__initialized 1
     }
@@ -1730,7 +1730,7 @@
     if {![info exists :editor]} {
       set :editor [parameter::get_global_value -package_key xowiki \
                          -parameter PreferredRichtextEditor -default ckeditor4]
-      #my msg "setting default of ${:name} to ${:editor}"
+      #:msg "setting default of ${:name} to ${:editor}"
     }
     if {![info exists :__initialized]} {
       #
@@ -1744,7 +1744,7 @@
   }
 
   richtext instproc render_richtext_as_div {} {
-    #my msg "[:get_attributes id style {CSSclass class}]"
+    #:msg "[:get_attributes id style {CSSclass class}]"
     ::html::div [:get_attributes id style {CSSclass class}] {
       if {[:wiki]} {
         ${:object} references clear
@@ -2316,7 +2316,7 @@
       # possible skins are per in the distribution: "default", "sliver", "minimal" and "twopanels"
       set config [list "skin: '[:skin]'"]
 
-      #my msg "wym, h [info exists :height] || w [info exists :width]"
+      #:msg "wym, h [info exists :height] || w [info exists :width]"
       if {[info exists :height] || [info exists :width]} {
         set height_cmd ""
         set width_cmd ""
@@ -2617,7 +2617,7 @@
     # - view mode: the fields were deactivated (made insensitive);
     #   this means: keep the old value
 
-    #my msg "${:name} disabled=[info exists :disabled]"
+    #:msg "${:name} disabled=[info exists :disabled]"
     if {[info exists :disabled]} {return $default} else {return ""}
   }
   checkbox instproc render_input {} {
@@ -2675,7 +2675,7 @@
         lassign $o label rep
         set atts [:get_attributes disabled]
         lappend atts value $rep
-        #my msg "lsearch {[:value]} $rep ==> [lsearch [:value] $rep]"
+        #:msg "lsearch {[:value]} $rep ==> [lsearch [:value] $rep]"
         if {$rep in [:value]} {
           lappend atts selected selected
         }
@@ -2697,7 +2697,7 @@
   candidate_box_select set abstract 1
 
   candidate_box_select instproc render_input {} {
-    #my msg "mul=[:multiple]"
+    #:msg "mul=[:multiple]"
     # makes only sense currently for multiple selects
     if {[:multiple] && [:dnd]} {
       if {[info exists :disabled] && [:disabled]} {
@@ -2738,7 +2738,7 @@
         ::html::div -class workarea {
           ::html::h3 { ::html::t "#xowiki.Candidates#"}
           ::html::ul -id ${:id}_candidates -class region {
-            #my msg ${:options}
+            #:msg ${:options}
             foreach o ${:options} {
               lassign $o label rep
               # Don't show current values under candidates
@@ -2806,7 +2806,7 @@
       set hrefs [list]
       foreach i $v {
         if {![info exists labels($i)]} {
-          #my msg "can't determine label for value '$i' (values=$v, l=[array names labels])"
+          #:msg "can't determine label for value '$i' (values=$v, l=[array names labels])"
           set labels($i) $i
         }
         set href [${:package_id} pretty_link -parent_id $parent_id $i]
@@ -2820,7 +2820,7 @@
     } else {
       foreach o ${:options} {
         lassign $o label value
-        #my log "comparing '$value' with '$v'"
+        #:log "comparing '$value' with '$v'"
         if {$value eq $v} {
           if {[:as_box]} {
             return [$object include [list $value -decoration rightbox]]
@@ -2865,15 +2865,15 @@
     foreach form_obj $form_objs {lappend :form_object_item_ids [$form_obj item_id]}
   }
   form_page instproc compute_options {} {
-    #my msg "${:name} compute_options [info exists :form]"
+    #:msg "${:name} compute_options [info exists :form]"
     if {![info exists :form]} {
       return
     }
 
     array set wc {tcl true h "" vars "" sql ""}
     if {[info exists :where]} {
       array set wc [::xowiki::FormPage filter_expression ${:where} &&]
-      #my msg "where '${:where}' => wc=[array get wc]"
+      #:msg "where '${:where}' => wc=[array get wc]"
     }
 
     set from_package_ids {}
@@ -3183,7 +3183,7 @@
         return 0
       }
     }
-    #my msg "guess mime_type of $entry_name = [::xowiki::guesstype $entry_name]"
+    #:msg "guess mime_type of $entry_name = [::xowiki::guesstype $entry_name]"
     set import_file [ad_tmpnam]
     ::xowiki::write_file $import_file $img
     set file_object [::xowiki::File new -destroy_on_cleanup \
@@ -3236,7 +3236,7 @@
       # resetting esp. the item-id is dangerous.
       # Therefore we reset it immediately after the rendering
       #
-      #my log "set __RESOLVE_LOCAL"
+      #:log "set __RESOLVE_LOCAL"
       $item_id set __RESOLVE_LOCAL 1
       $item_id set_resolve_context \
           -package_id [${:object} package_id] -parent_id [${:object} parent_id] \
@@ -3277,7 +3277,7 @@
   } -extend_slot_default validator compound
 
   CompoundField instproc check=compound {value} {
-    #my msg "check compound in [:components]"
+    #:msg "check compound in [:components]"
     foreach c [:components] {
       set error [$c validate [self]]
       if {$error ne ""} {
@@ -3291,7 +3291,7 @@
   }
 
   CompoundField instproc set_disabled {disable} {
-    #my msg "${:name} set disabled $disable"
+    #:msg "${:name} set disabled $disable"
     if {$disable} {
       set :disabled true
     } else {
@@ -3326,10 +3326,10 @@
   CompoundField instproc value {args} {
     if {[llength $args] == 0} {
       set v [:get_compound_value]
-      #my msg "${:name}: reading compound value => '$v'"
+      #:msg "${:name}: reading compound value => '$v'"
       return $v
     } else {
-      #my msg "${:name}: setting compound value => '[lindex $args 0]'"
+      #:msg "${:name}: setting compound value => '[lindex $args 0]'"
       :set_compound_value [lindex $args 0]
     }
   }
@@ -3391,10 +3391,10 @@
     # Set the internal representation based on the components values.
     set value [list]
     foreach c [:components] {
-      #my msg "$c [$c info class] lappending [list [$c name] [$c value]]"
+      #:msg "$c [$c info class] lappending [list [$c name] [$c value]]"
       lappend value [$c name] [$c value]
     }
-    #my msg "${:name}: get_compound_value returns value=$value"
+    #:msg "${:name}: get_compound_value returns value=$value"
     return $value
   }
 
@@ -3486,7 +3486,7 @@
     set sub [self]
     foreach e $args {
       append component_name .$e
-      #my msg "check $sub set component_index($component_name)"
+      #:msg "check $sub set component_index($component_name)"
       set sub [$sub set component_index($component_name)]
     }
     return $sub
@@ -3632,7 +3632,7 @@
   # "yesterday", "next week", .... use _ for blanks
 
   date instproc initialize {} {
-    #my msg "DATE has value [:value]//d=[:default] format=[:format] disabled?[info exists :disabled]"
+    #:msg "DATE has value [:value]//d=[:default] format=[:format] disabled?[info exists :disabled]"
     set :widget_type date
     set :format [string map [list _ " "] [:format]]
     array set :defaults {year 2000 month 01 day 01 hour 00 min 00 sec 00}
@@ -3646,7 +3646,7 @@
       MONTH {month %m 1}
       YYYY  {YYYY  %Y 0}
     }
-    #my msg "${:name} initialize date, format=[:format] components=[:components]"
+    #:msg "${:name} initialize date, format=[:format] components=[:components]"
     foreach c [:components] {$c destroy}
     :components [list]
 
@@ -3672,7 +3672,7 @@
       set c [::xowiki::formfield::$class create [self]::$name \
                  -name ${:name}.$name -id ${:id}.$name \
                  -locale [:locale] -object ${:object}]
-      #my msg "creating ${:name}.$name"
+      #:msg "creating ${:name}.$name"
       $c set_disabled [info exists :disabled]
       $c set code $code
       $c set trim_zeros $trim_zeros
@@ -3681,7 +3681,7 @@
   }
 
   date instproc set_compound_value {value} {
-    #my msg "${:name} original value '[:value]' // passed='$value' disa?[info exists :disabled]"
+    #:msg "${:name} original value '[:value]' // passed='$value' disa?[info exists :disabled]"
     # if {$value eq ""} {return}
     if { $value eq {} } {
       # We need to reset component values so that
@@ -3694,7 +3694,7 @@
       return
     }
     set value [::xo::db::tcl_date $value tz]
-    #my msg "transformed value '$value'"
+    #:msg "transformed value '$value'"
     if {$value ne ""} {
       set ticks [clock scan [string map [list _ " "] $value]]
     } else {
@@ -3719,7 +3719,7 @@
       } else {
         set value_part ""
       }
-      #my msg "ticks=$ticks $c value $value_part"
+      #:msg "ticks=$ticks $c value $value_part"
       $c value $value_part
     }
   }
@@ -3746,12 +3746,12 @@
     foreach v [list year month day hour min sec] {
       if {[set $v] eq ""} {set $v [set :defaults($v)]}
     }
-    #my msg "$year-$month-$day ${hour}:${min}:${sec}"
+    #:msg "$year-$month-$day ${hour}:${min}:${sec}"
     if {[catch {set ticks [clock scan "$year-$month-$day ${hour}:${min}:${sec}"]}]} {
       set ticks 0 ;# we assume that the validator flags these values
     }
     # TODO: TZ???
-    #my msg "DATE ${:name} get_compound_value returns [clock format $ticks -format {%Y-%m-%d %T}]"
+    #:msg "DATE ${:name} get_compound_value returns [clock format $ticks -format {%Y-%m-%d %T}]"
     return [clock format $ticks -format "%Y-%m-%d %T"]
   }
 
@@ -3876,7 +3876,7 @@
 
   form instproc check=form {value} {
     set form $value
-    #my msg form=$form
+    #:msg form=$form
     dom parse -simple -html $form doc
     $doc documentElement root
     set rootNodeName ""
@@ -3914,7 +3914,7 @@
   }
 
   event instproc initialize {} {
-    #my log "event initialize [info exists :__initialized], multi=[:multiday] state=${:__state}"
+    #:log "event initialize [info exists :__initialized], multi=[:multiday] state=${:__state}"
     if {${:__state} ne "after_specs"} return
     set :widget_type event
     if {[:multiday]} {
@@ -3948,7 +3948,7 @@
       set end_day  [lindex [$dtstart value] 0]
       set end_time [lindex [$dtend value] 1]
       $dtend value "$end_day $end_time"
-      #my msg "[$dtend name] set to '$end_day $end_time' ==> $dtend, [$dtend value]"
+      #:msg "[$dtend name] set to '$end_day $end_time' ==> $dtend, [$dtend value]"
     }
     next
   }
@@ -4069,11 +4069,11 @@
     # update the instance variables.
     #
     if {$cal_item_id ne ""} {
-      #my log "===== [list calendar::item::edit -start_date $start -end_date $end -cal_item_id $cal_item_id ...]"
+      #:log "===== [list calendar::item::edit -start_date $start -end_date $end -cal_item_id $cal_item_id ...]"
       calendar::item::edit -cal_item_id $cal_item_id -start_date $start \
           -end_date $end -name $name -description $description
     } else {
-      #my log "===== [list calendar::item::new -start_date $start -end_date $end -calendar_id $calendar_id ...]"
+      #:log "===== [list calendar::item::new -start_date $start -end_date $end -calendar_id $calendar_id ...]"
       set cal_item_id [calendar::item::new -start_date $start -end_date $end \
                            -name $name -description $description -calendar_id $calendar_id]
       [:get_component cal_item_id] value $cal_item_id
Index: openacs-4/packages/xowiki/tcl/import-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/import-procs.tcl,v
diff -u -N -r1.37 -r1.38
--- openacs-4/packages/xowiki/tcl/import-procs.tcl	13 Feb 2018 15:07:06 -0000	1.37
+++ openacs-4/packages/xowiki/tcl/import-procs.tcl	9 Apr 2018 07:58:06 -0000	1.38
@@ -48,22 +48,22 @@
     $object demarshall -parent_id [$object parent_id] -package_id ${:package_id} \
         -creation_user ${:user_id} -create_user_ids $create_user_ids
     set item_id [::xo::db::CrClass lookup -name [$object name] -parent_id [$object parent_id]]
-    #my msg "lookup of [$object name] parent [$object parent_id] => $item_id"
+    #:msg "lookup of [$object name] parent [$object parent_id] => $item_id"
     if {$item_id != 0} {
       if {$replace} { ;# we delete the original
         ::xo::db::CrClass delete -item_id $item_id
         set item_id 0
         :report_line $object replaced
         incr :replaced
       } else {
-        #my msg "$item_id update: [$object name]"
+        #:msg "$item_id update: [$object name]"
         ::xo::db::CrClass get_instance_from_db -item_id $item_id
         $item_id copy_content_vars -from_object $object
         $item_id save -use_given_publish_date [$item_id exists publish_date] \
             -modifying_user [$object set modifying_user]
-        #my log "$item_id saved"
+        #:log "$item_id saved"
         $object set item_id [$item_id item_id]
-        #my msg "$item_id updated: [$object name]"
+        #:msg "$item_id updated: [$object name]"
         :report_line $item_id updated
         incr :updated
       }
@@ -73,7 +73,7 @@
                  -creation_user [$object set modifying_user] ]
       $object set item_id $n
       set item_id $object
-      #my msg "$object added: [$object name]"
+      #:msg "$object added: [$object name]"
       :report_line $object added
       incr :added
     }
@@ -82,7 +82,7 @@
     # Insert these into the category object map
     #
     if {[$object exists __category_ids]} {
-      #my msg "$item_id map_categories [object set __category_ids] // [$item_id item_id]"
+      #:msg "$item_id map_categories [object set __category_ids] // [$item_id item_id]"
       $item_id map_categories [$object set __category_ids]
     }
 
@@ -132,7 +132,7 @@
       #  array set ::__category_map [$o set __category_map]
       #}
     }
-    #my msg "item_ids=[array names item_ids], parent_ids=[array names parent_ids]"
+    #:msg "item_ids=[array names item_ids], parent_ids=[array names parent_ids]"
 
     #
     # Make a fix-point iteration during import. Do only import, when
@@ -141,7 +141,7 @@
     while {[array size todo] > 0} {
       set new 0
       foreach o [array names todo] {
-        #my msg "work on $o [$o info class] [$o name]"
+        #:msg "work on $o [$o info class] [$o name]"
 
         set old_name      [$o name]
         set old_item_id   [$o item_id]
@@ -158,16 +158,16 @@
           
           set template_name_key $parent_ids($old_template_id)-$old_names($old_template_id)
           if {![info exists name_map($template_name_key)]} {
-            #my msg "... delay import of $o (no object with name $template_name_key) imported"
+            #:msg "... delay import of $o (no object with name $template_name_key) imported"
             continue
           }
-          #my msg "we found entry for name_map($template_name_key) = $name_map($template_name_key)"
+          #:msg "we found entry for name_map($template_name_key) = $name_map($template_name_key)"
         }
 
         if {[info exists item_ids($old_parent_id)]} {
           # we have a child object
           if {![info exists id_map($old_parent_id)]} {
-            #my msg "... delay import of $o (map of parent_id $old_parent_id missing)"
+            #:msg "... delay import of $o (map of parent_id $old_parent_id missing)"
             continue
           }
         }
@@ -197,7 +197,7 @@
           #   set inherited [expr {[$page physical_parent_id] ne [$page parent_id]}]
 
           if {$page ne ""} {
-            #my msg "page [$o name] can ne found in folder ${:parent_id}"
+            #:msg "page [$o name] can ne found in folder ${:parent_id}"
             incr :inherited
             unset todo($o)
             set o $page
@@ -212,12 +212,12 @@
           # objects to new IDs.
           #
           if {[$o istype ::xowiki::PageInstance]} {
-            #my msg "importing [$o name] page_instance, map $template_name_key to $name_map($template_name_key)"
+            #:msg "importing [$o name] page_instance, map $template_name_key to $name_map($template_name_key)"
             $o page_template $name_map($template_name_key)
-            #my msg "exists template? [:isobject [$o page_template]]"
+            #:msg "exists template? [:isobject [$o page_template]]"
             if {![:isobject [$o page_template]]} {
               ::xo::db::CrClass get_instance_from_db -item_id [$o page_template]
-              #my msg "[:isobject [$o page_template]] loaded"
+              #:msg "[:isobject [$o page_template]] loaded"
             }
           }
           
@@ -229,12 +229,12 @@
           
           # Everything is mapped, we can now do the import.
           
-          #my msg "start import for $o, name=[$o name]"
+          #:msg "start import for $o, name=[$o name]"
           :import \
               -object $o \
               -replace $replace \
               -create_user_ids $create_user_ids
-          #my msg "import for $o done, name=[$o name]"
+          #:msg "import for $o done, name=[$o name]"
 
           unset todo($o)
         }
@@ -246,7 +246,7 @@
           set id_map($old_item_id) [$o item_id]
         }
         set name_map($old_parent_id-$old_name) [$o item_id]
-        #my msg "setting name_map($old_parent_id-$old_name)=$name_map($old_parent_id-$old_name), o=$o, old_item_id=$old_item_id"
+        #:msg "setting name_map($old_parent_id-$old_name)=$name_map($old_parent_id-$old_name), o=$o, old_item_id=$old_item_id"
         
         set new 1
       }
@@ -255,7 +255,7 @@
         break
       }
     }
-    #my msg "final name_map=[array get name_map], id_map=[array get id_map]"
+    #:msg "final name_map=[array get name_map], id_map=[array get id_map]"
 
     #
     # final cleanup
@@ -391,13 +391,13 @@
   }
   ArchiveFile instproc unpack {} {
     set success 0
-    #my log "::xowiki::guesstype '${:name}' => [::xowiki::guesstype ${:name}]"
+    #:log "::xowiki::guesstype '${:name}' => [::xowiki::guesstype ${:name}]"
     switch [::xowiki::guesstype ${:name}] {
       application/zip -
       application/x-zip -
       application/x-zip-compressed {
         set zipcmd [::util::which unzip]
-        #my msg "zip = $zipcmd, tempdir = ${:tmpdir}"
+        #:msg "zip = $zipcmd, tempdir = ${:tmpdir}"
         exec $zipcmd ${:file} -d ${:tmpdir}
         :import -dir ${:tmpdir} -parent_id ${:parent_id}
         set success 1
@@ -412,16 +412,16 @@
           :msg "unknown compressed file type ${:name}"
         }
       }
-      default {my msg "type [::xowiki::guesstype ${:name}] of ${:name} unknown"}
+      default {:msg "type [::xowiki::guesstype ${:name}] of ${:name} unknown"}
     }
-    #my msg success=$success
+    #:msg success=$success
     return $success
   }
   ArchiveFile instproc import {-dir -parent_id} {
     set package_id [$parent_id package_id]
 
     foreach tmpfile [glob -nocomplain -directory $dir *] {
-      #my msg "work on $tmpfile [::file isdirectory $tmpfile]"
+      #:msg "work on $tmpfile [::file isdirectory $tmpfile]"
       set file_name [::file tail $tmpfile]
       if {[::file isdirectory $tmpfile]} {
         # ignore mac os x resource fork directories
@@ -481,7 +481,7 @@
             $f content-type $mime_type
             $f set tmpfile $tmpfile
             $f convert_to_internal
-            #my log "after convert to internal $file_name"
+            #:log "after convert to internal $file_name"
           }
         } else {
           set file_object [$package_id get_page_from_name -name file:$file_name -parent_id $parent_id]
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.215 -r1.216
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	9 Apr 2018 07:47:05 -0000	1.215
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	9 Apr 2018 07:58:06 -0000	1.216
@@ -53,7 +53,7 @@
   }    
   
   ::xowiki::Includelet proc describe_includelets {includelet_classes} {
-    #my log "--plc=$includelet_classes "
+    #:log "--plc=$includelet_classes "
     foreach cl $includelet_classes {
       set result ""
       append result "{{<b>[namespace tail $cl]</b>"
@@ -163,14 +163,14 @@
       set locale $default_locale
       set include_system_locale 0
     }
-    #my msg "--L with_system_locale=$with_system_locale, locale=$locale, default_locale=$default_locale"
+    #:msg "--L with_system_locale=$with_system_locale, locale=$locale, default_locale=$default_locale"
 
     set locale_clause ""    
     if {$locale ne ""} {
       set locale_clause " and $revisions.nls_language = '$locale'" 
       if {$with_system_locale} {
         set system_locale [lang::system::locale -package_id $package_id]
-        #my msg "system_locale=$system_locale, default_locale=$default_locale"
+        #:msg "system_locale=$system_locale, default_locale=$default_locale"
         if {$system_locale ne $default_locale} {
           set locale_clause " and ($revisions.nls_language = '$locale' 
         or $revisions.nls_language = '$system_locale' and not exists
@@ -180,7 +180,7 @@
       } 
     }
 
-    #my msg "--locale $locale, def=$default_locale sys=$system_locale, cl=$locale_clause locale_clause=$locale_clause"
+    #:msg "--locale $locale, def=$default_locale sys=$system_locale, cl=$locale_clause locale_clause=$locale_clause"
     return [list $locale $locale_clause]
   }
 
@@ -212,7 +212,7 @@
       set cnames [join $or_names { or }]
       set extra_where_clause "and ([join $ors { or }])"
     }
-    #my log "--cnames $category_spec -> $cnames // <$extra_where_clause>"
+    #:log "--cnames $category_spec -> $cnames // <$extra_where_clause>"
     return [list $cnames $extra_where_clause]
   }
 
@@ -420,12 +420,12 @@
     if {[catch {set data [ns_cache get xowiki_cache $key-data]}]} {
       :cache_includelet_data $key-data
     } else {
-      #my msg "eval $data"
+      #:msg "eval $data"
       {*}$data
     }
     return $HTML
   } -instproc cache_includelet_data {key} {
-    #my msg "data=[next]"
+    #:msg "data=[next]"
     set data [next]
     if {$data ne ""} {ns_cache set xowiki_cache $key $data}
   }
@@ -711,7 +711,7 @@
                    -names $tree_name \
                    -output {tree_id tree_name}]
     
-    #my msg "[llength $trees] == 0 && $tree_name"
+    #:msg "[llength $trees] == 0 && $tree_name"
     if {[llength $trees] == 0 && $tree_name ne ""} {
       # we have nothing left from mapped trees, maybe the tree_names are not mapped; 
       # try to get these
@@ -1019,7 +1019,7 @@
       if {$allow_edit} {
         set p [::xo::db::CrClass get_instance_from_db -item_id 0 -revision_id $page_id]
         set edit_link [$entry_package_id make_link -link $page_link $p edit return_url]
-        #my log "page_link=$page_link, edit=$edit_link"
+        #:log "page_link=$page_link, edit=$edit_link"
         [t1 last_child] set edit.href $edit_link
         [t1 last_child] set edit "&nbsp;"
       }
@@ -1472,7 +1472,7 @@
     }
     foreach cat_id [category::get_mapped_categories [${:__including_page} set item_id]] {
       lassign [category::get_data $cat_id] category_id category_name tree_id tree_name
-      #my log "--cat $cat_id $category_id $category_name $tree_id $tree_name"
+      #:log "--cat $cat_id $category_id $category_name $tree_id $tree_name"
       set label [ns_quotehtml "$category_name ($tree_name)"]
       set entry "<a href='[ns_quotehtml $href&category_id=$category_id]'>[ns_quotehtml $label]</a>"
       if {$notification_type ne ""} {
@@ -1801,7 +1801,7 @@
                        -user_id [[${:package_id} context] user_id] \
                        -package_id ${:package_id} \
                        ${:package_id} change-page-order]
-      #my msg "granted=$granted"
+      #:msg "granted=$granted"
       if {$granted} {
         if {$with_head_entries} {
           set ajaxhelper 1
@@ -1902,7 +1902,7 @@
     }
     lassign [::xowiki::Includelet locale_clause -revisions p -items p $package_id $locale] \
         locale locale_clause
-    #my msg locale_clause=$locale_clause
+    #:msg locale_clause=$locale_clause
 
     if {$source ne ""} {
       :get_page_order -source $source
@@ -1962,7 +1962,7 @@
   }
 
   toc instproc page_number {page_order remove_levels} {
-    #my log "o: $page_order"
+    #:log "o: $page_order"
     set displayed_page_order $page_order
     for {set i 0} {$i < $remove_levels} {incr i} {
       regsub {^[^.]+[.]} $displayed_page_order "" displayed_page_order
@@ -2006,7 +2006,7 @@
       }
     }
     set :navigation(count) $node_cnt
-    #my log OPEN=[lsort [array names :open_node]]
+    #:log OPEN=[lsort [array names :open_node]]
   }
 
   #
@@ -2161,7 +2161,7 @@
     # Render the tree with the yui widget (with or without ajax)
     #
     if {$book_mode} {
-      #my log "--warn: cannot use bookmode with ajax, resetting ajax"
+      #:log "--warn: cannot use bookmode with ajax, resetting ajax"
       set ajax 0
     }
     set :ajax $ajax
@@ -2394,7 +2394,7 @@
   composite-form instproc render {} {
     :get_parameters
     set inner_html [next]
-    #my log "innerhtml=$inner_html"
+    #:log "innerhtml=$inner_html"
     regsub -nocase -all "<form " $inner_html "<div class='form' " inner_html
     regsub -nocase -all "<form>" $inner_html "<div class='form'>" inner_html
     regsub -nocase -all "</form *>" $inner_html "</div>" inner_html
@@ -3133,7 +3133,7 @@
     foreach p [lsort -index 1 -decreasing -integer $edges] {
       lassign $p edge weight width
       lassign [split $edge ,] a b
-      #my log "--G $a -> $b check $c > $max_edges, $weight < $cutoff"
+      #:log "--G $a -> $b check $c > $max_edges, $weight < $cutoff"
       if {[incr c] > $max_edges} break
       if {$weight < $cutoff} continue
       append edgesHTML "g.addEdge(\$('$a'), \$('$b'), $weight, 0, $width);\n"
@@ -3275,7 +3275,7 @@
     }
 
     set tmp_table_name XOWIKI_TMP_ACTIVITY
-    #my msg "tmp exists [::xo::db::require exists_table $tmp_table_name]"
+    #:msg "tmp exists [::xo::db::require exists_table $tmp_table_name]"
     set tt [::xo::db::temp_table new \
                 -name $tmp_table_name \
                 -query [::xo::dc select \
@@ -3509,7 +3509,7 @@
   
   form-menu instproc render {} {
     :get_parameters
-    #my msg form-menu-[info exists form_item_id] buttons=$buttons
+    #:msg form-menu-[info exists form_item_id] buttons=$buttons
     if {![info exists form_item_id]} {
       set form_item_id [::xowiki::Weblog instantiate_forms \
                             -forms $form \
@@ -3805,7 +3805,7 @@
     foreach form_item $form_item_ids {
       append form_constraints [$form_item get_form_constraints -trylocal true] \n
     }
-    #my log fc=$form_constraints
+    #:log fc=$form_constraints
 
     # load table properties; order_by won't work due to comma, but solve that later (TODO)
     set table_properties [::xowiki::PageInstance get_list_from_form_constraints \
@@ -3821,7 +3821,7 @@
         where -   with_categories - with_form_link - csv - view_field -
         voting_form - voting_form_form - voting_form_anon_instances {
           set $attr $value
-          #my msg " set $attr $value"
+          #:msg " set $attr $value"
         }
         default {error "unknown table property '$attr' provided"}
       }
@@ -3934,7 +3934,7 @@
       if {$att eq "_page_order"} {
         t1 mixin add ::xo::OrderedComposite::IndexCompare
       }
-      #my msg "order=[expr {$order eq {asc} ? {increasing} : {decreasing}}] $att"
+      #:msg "order=[expr {$order eq {asc} ? {increasing} : {decreasing}}] $att"
       t1 orderby -order [expr {$order eq "asc" ? "increasing" : "decreasing"}] $att
     }
 
@@ -3952,13 +3952,13 @@
       array set wc [::xowiki::FormPage filter_expression $where &&]
       set init_vars [list {*}$init_vars {*}$wc(vars)]
     }
-    #my msg uc=[array get uc]
-    #my msg wc=[array get wc]
+    #:msg uc=[array get uc]
+    #:msg wc=[array get wc]
 
     #
     # get an ordered composite of the base set (currently including extra_where clause)
     # 
-    #my log "exists category_id [info exists category_id]"
+    #:log "exists category_id [info exists category_id]"
     set extra_where_clause ""
     if {[info exists category_id]} {
       lassign [:category_clause $category_id item_id] cnames extra_where_clause
@@ -3989,7 +3989,7 @@
                             -package_id $package_id]
       }
     }
-    #my log "queries done"
+    #:log "queries done"
     if {[info exists wf]} {
       set wf_link [$package_id pretty_link -parent_id $parent_id -path_encode false $wf]
     }
@@ -4098,7 +4098,7 @@
       lappend links " <a href='[ns_quotehtml $href]'>Generate Voting Form $voting_form</a>"
     }
     append html [join $links ,]
-    #my log "render done"
+    #:log "render done"
 
     if {[info exists with_categories]} {
       set category_html [$o include [list categories -count 1 -tree_name $with_categories \
@@ -4109,7 +4109,7 @@
   }
 
   form-usages instproc generate_voting_form {form_name form_form t1 field_names voting_form_anon_instances} {
-    #my msg "generate_voting anon=$voting_form_anon_instances"
+    #:msg "generate_voting anon=$voting_form_anon_instances"
     set form "<form> How do you rate<br /> 
     <table rules='all' frame='box' cellspacing='1' cellpadding='1' border='0' style='border-style: none;'>
       <tbody> 
@@ -4257,7 +4257,7 @@
                      -extra_where_clause " and mime_type like 'image/%'" \
                      -orderby "name asc" \
                      -glob $glob]
-    #my msg "parent-id=$parent_id, glob=$glob entries=[llength [$listing children]]"
+    #:msg "parent-id=$parent_id, glob=$glob entries=[llength [$listing children]]"
 
     foreach entry [$listing children] {
       $entry class ::xowiki::Page
@@ -4282,7 +4282,7 @@
                    -always_queried_attributes * \
                    -parent_id $parent_id \
                    -package_id $package_id]
-    #my msg "parent-id=$parent_id, glob=$glob entries=[llength [$items children]]"
+    #:msg "parent-id=$parent_id, glob=$glob entries=[llength [$items children]]"
 
     foreach entry [$items children] {
       # order?
@@ -4309,7 +4309,7 @@
         $ff(image) label [$entry property _title]
       }
       $entry set html [$entry render_content]
-      #my log html=[$entry set html]
+      #:log html=[$entry set html]
     }
     return $items
   }
@@ -4575,7 +4575,7 @@
   }
 
   html-file instproc page_number {page_order remove_levels} {
-    #my log "o: $page_order"
+    #:log "o: $page_order"
     set displayed_page_order $page_order
     for {set i 0} {$i < $remove_levels} {incr i} {
       regsub {^[^.]+[.]} $displayed_page_order "" displayed_page_order
Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -N -r1.100 -r1.101
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	14 Mar 2018 15:40:49 -0000	1.100
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	9 Apr 2018 07:58:06 -0000	1.101
@@ -75,7 +75,7 @@
     if {![info exists :label]}      {set :label ${:name}}
     if {![info exists :parent_id]}  {set :parent_id [${:page} parent_id]}
     if {![info exists :package_id]} {set :package_id [${:page} package_id]}
-    #my msg "--L link has class [:info class] // $class // [:type] // ${:parent_id}"
+    #:msg "--L link has class [:info class] // $class // [:type] // ${:parent_id}"
   }
   Link instproc link_name {-lang -stripped_name} {
     return $lang:$stripped_name
@@ -205,7 +205,7 @@
       set package_id [site_node::get_children -node_id $a -package_key xowiki \
                           -filters [list name $name] -element package_id]
       if {$package_id ne ""} {
-        #my log "--LINK found package_id=$package_id [:isobject ::$package_id]"
+        #:log "--LINK found package_id=$package_id [:isobject ::$package_id]"
         ::xowiki::Package require $package_id
         return $package_id
       }
@@ -403,11 +403,11 @@
   ::xowiki::Link::image instproc render {} {
     set page [:page]
     set item_id [:resolve]
-    #my log "-- image resolve for $page returned $item_id (name=${:name}, label=${:label})"
+    #:log "-- image resolve for $page returned $item_id (name=${:name}, label=${:label})"
     if {$item_id} {
       set link [${:package_id} pretty_link -download true -query [:query] \
                     -absolute [$page absolute_links] -parent_id ${:parent_id} ${:name}]
-      #my log "--l fully quali [$page absolute_links], link=$link"
+      #:log "--l fully quali [$page absolute_links], link=$link"
       $page references resolved [list $item_id [:type]]
       :render_found $link ${:label}
     } else {
@@ -561,17 +561,17 @@
     # look for a package instance of xowiki, named "glossary" (the type)
     set id [:lookup_xowiki_package_by_name [:type] \
                 [site_node::get_node_id_from_object_id -object_id ${:package_id}]]
-    #my log "--LINK glossary lookup returned package_id $id"
+    #:log "--LINK glossary lookup returned package_id $id"
     if {$id > 0} {
       # set correct package id for rendering the link
       set :package_id $id
-      #my log "-- INITIALIZE $id"
+      #:log "-- INITIALIZE $id"
       #::xowiki::Package initialize -package_id $id
-      #my log "--u setting package_id to $id"
+      #:log "--u setting package_id to $id"
       # lookup the item from the found folder
       return [::xo::db::CrClass lookup -name [:name] -parent_id [$id set parent_id]]
     }
-    #my log "--LINK no page found [:name], [:lang], type=[:type]."
+    #:log "--LINK no page found [:name], [:lang], type=[:type]."
     return 0
   }
   ::xowiki::Link::glossary instproc render_found {href label} {
Index: openacs-4/packages/xowiki/tcl/menu-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/menu-procs.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/xowiki/tcl/menu-procs.tcl	6 Apr 2018 16:06:32 -0000	1.14
+++ openacs-4/packages/xowiki/tcl/menu-procs.tcl	9 Apr 2018 07:58:06 -0000	1.15
@@ -165,7 +165,7 @@
     lappend :Menues $name
     if {$label eq ""} {set label $name}
     set :Menu($name) [list label $label]
-    #my log "menues: ${:Menues}"
+    #:log "menues: ${:Menues}"
   }
 
   ::xowiki::MenuBar instproc additional_sub_menu {-kind:required -pages:required -owner:required} {
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -N -r1.313 -r1.314
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	9 Apr 2018 07:40:03 -0000	1.313
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	9 Apr 2018 07:58:06 -0000	1.314
@@ -249,19 +249,19 @@
       if {$p == 0} {
         # content pages are stored with a lang prefix
         set p [:lookup -name ${lang}:$parent -parent_id $parent_id]
-        #my log "check with prefix '${lang}:$parent' returned $p"
+        #:log "check with prefix '${lang}:$parent' returned $p"
 
         if {$p == 0 && $lang ne "en"} {
           # try again with prefix "en"
           set p [:lookup -name en:$parent -parent_id $parent_id]
-          #my log "check with en 'en:$parent' returned $p"
+          #:log "check with en 'en:$parent' returned $p"
         }
       }
 
       if {$p != 0} {
         if {[regexp {^([^/]+)/(.+)$} $local_name _ parent2 local_name2]} {
           set p2 [:get_parent_and_name -path $local_name -lang $lang -parent_id $p parent local_name]
-          #my log "recursive call for '$local_name' parent_id=$p returned $p2"
+          #:log "recursive call for '$local_name' parent_id=$p returned $p2"
           if {$p2 != 0} {
             set p $p2
           }
@@ -325,7 +325,7 @@
 
     if { $context_url ne {} } {
       set context_id [:get_parent_and_name -path $context_url -lang "" -parent_id $parent_id parent local_name]
-      #my msg "context_url $context_url folder_ids $folder_ids context_id $context_id"
+      #:msg "context_url $context_url folder_ids $folder_ids context_id $context_id"
     }
 
     set path ""
@@ -336,11 +336,11 @@
       if { $context_url ne {} } {
         set context_name [lindex $parts $index]
         if {1 && $parent_id in $folder_ids} {
-          #my msg "---- parent $parent_id in $folder_ids"
+          #:msg "---- parent $parent_id in $folder_ids"
           set context_id [$context_id item_id]
           set fo [::xo::db::CrClass get_instance_from_db -item_id $context_id]
         } else {
-          #my msg "context_url $context_url, parts $parts, context_name $context_name // parts $parts // index $index / folder $fo"
+          #:msg "context_url $context_url, parts $parts, context_name $context_name // parts $parts // index $index / folder $fo"
 
           if { [$fo name] ne $context_name } {
             set context_folder [:get_page_from_name -parent_id $parent_id -assume_folder true -name $context_name]
@@ -361,7 +361,7 @@
         }
       }
 
-      #my get_lang_and_name -name [$fo name] lang stripped_name
+      #:get_lang_and_name -name [$fo name] lang stripped_name
       #set path $stripped_name/$path
 
       if {[$fo parent_id] < 0} break
@@ -370,7 +370,7 @@
         set pid [$fo package_id]
         foreach id $ids {
           if {[$id package_id] ne $pid} {
-            #my msg "SYMLINK ++++ have to fix package_id of $id from [$id package_id] to $pid"
+            #:msg "SYMLINK ++++ have to fix package_id of $id from [$id package_id] to $pid"
             $id set_resolve_context -package_id $pid -parent_id [$id parent_id]
           }
         }
@@ -382,7 +382,7 @@
           #
           set target [$fo get_target_from_link_page]
           set target_name [$target name]
-          #my msg "----- $path //  target $target [$target name] package_id [$target package_id] path '$path'"
+          #:msg "----- $path //  target $target [$target name] package_id [$target package_id] path '$path'"
           set orig_path $path
           regsub "^$target_name/" $path "" path
           if {$orig_path ne $path} {
@@ -399,14 +399,14 @@
       set path $name/$path
 
       if {${:folder_id} == [$fo parent_id]} {
-        #my msg ".... :folder_id [:folder_id] == $fo parentid"
+        #:msg ".... :folder_id [:folder_id] == $fo parentid"
         break
       }
 
       set parent_id [$fo parent_id]
     }
 
-    #my msg ====$path
+    #:msg ====$path
     return $path
   }
 
@@ -424,7 +424,7 @@
     if {$folder ne ""} {
       # Return the stripped name for sub-items, the parent has already
       # the language prefix
-      #my get_lang_and_name -name $name lang stripped_name
+      # :get_lang_and_name -name $name lang stripped_name
       return $folder$name
     }
     return $name
@@ -457,23 +457,23 @@
     @param parent_id parent_id
     @param name name of the wiki page
   } {
-    #my msg "input name=$name, lang=$lang parent_id=$parent_id"
+    #:msg "input name=$name, lang=$lang parent_id=$parent_id"
     set default_lang [:default_language]
 
     :get_lang_and_name -default_lang $lang -name $name lang name
 
     set host [expr {$absolute ? ($siteurl ne "" ? $siteurl : [ad_url]) : ""}]
     if {$anchor ne ""} {set anchor \#$anchor}
     if {$query ne ""} {set query ?$query}
-    #my log "--LINK $lang == $default_lang [expr {$lang ne $default_lang}] $name"
+    #:log "--LINK $lang == $default_lang [expr {$lang ne $default_lang}] $name"
 
     set package_prefix [:get_parameter package_prefix ${:package_url}]
     if {$package_prefix eq "/" && [string length $lang]>2} {
       # don't compact the the path for images etc. to avoid conflicts
       # with e.g. //../image/*
       set package_prefix ${:package_url}
     }
-    #my msg "lang=$lang, default_lang=$default_lang, name=$name, parent_id=$parent_id, package_prefix=$package_prefix"
+    #:msg "lang=$lang, default_lang=$default_lang, name=$name, parent_id=$parent_id, package_prefix=$package_prefix"
     if {$path_encode} {
       set encoded_name [ad_urlencode_path $name]
     } else {
@@ -498,15 +498,15 @@
       }
       set package_prefix [$pkg get_parameter package_prefix [$pkg package_url]]
     }
-    #my msg "folder_path = $folder, -parent_id $parent_id -folder_ids $folder_ids // default_lang [:default_language]"
+    #:msg "folder_path = $folder, -parent_id $parent_id -folder_ids $folder_ids // default_lang [:default_language]"
 
     # if {$folder ne ""} {
     #   # if folder has a different language than the content, we have to provide a prefix....
     #   regexp {^(..):} $folder _ default_lang
     # }
 
-    #my log "h=${host}, prefix=${package_prefix}, folder=$folder, name=$encoded_name anchor=$anchor download=$download"
-    #my msg folder=$folder,lang=$lang,default_lang=$default_lang
+    #:log "h=${host}, prefix=${package_prefix}, folder=$folder, name=$encoded_name anchor=$anchor download=$download"
+    #:msg folder=$folder,lang=$lang,default_lang=$default_lang
     if {$download} {
       #
       # use the special download (file) syntax
@@ -524,16 +524,16 @@
       #
       set url ${host}${package_prefix}$folder$encoded_name$query$anchor
     }
-    #my msg "final url=$url"
+    #:msg "final url=$url"
     return $url
   }
 
   Package instproc init {} {
-    #my log "--R creating + folder_object"
+    #:log "--R creating + folder_object"
     next
     :require_folder_object
     set :policy [:get_parameter -check_query_parameter false security_policy ::xowiki::policy1]
-    #my proc destroy {} {my log "--P "; next}
+    # :proc destroy {} {:log "--P "; next}
   }
 
   #
@@ -568,7 +568,7 @@
           if {$page eq ""} {
             ad_log error "Could not resolve parameter page '$pp' of package ${:id}."
           }
-          #my msg pp=$pp,page=$page-att=$attribute
+          #:msg pp=$pp,page=$page-att=$attribute
 
           if {$page ne "" && [$page exists instance_attributes]} {
             set __ia [$page set instance_attributes]
@@ -588,7 +588,7 @@
         default {error "requested type unknown: $type"}
       }
     }
-    #my log "           $attribute returns '$value'"
+    #:log "           $attribute returns '$value'"
     return $value
   }
 
@@ -656,7 +656,7 @@
       set provided_name $page_name
       set search 1
     }
-    #my msg [self args]->[list package_id $package_id page_name $page_name url $url provided_name $provided_name search $search]
+    #:msg [self args]->[list package_id $package_id page_name $page_name url $url provided_name $provided_name search $search]
     return [list package_id $package_id page_name $page_name url $url provided_name $provided_name search $search]
   }
 
@@ -699,7 +699,7 @@
       # url. This could be done probably with a flag to initialize,
       # but we get below the object name from the package_id...
       #
-      #my log "cross package request $page_name"
+      #:log "cross package request $page_name"
       #
       set last_package_id $package_id
       set last_url [:url]
@@ -712,7 +712,7 @@
       #
       ::xowiki::Package initialize -parameter {{-m view}} -url $(url)$(provided_name) \
           -actual_query ""
-      #my log "url=$url=>[$package_id serialize]"
+      #:log "url=$url=>[$package_id serialize]"
 
       if {$package_id != 0} {
         #
@@ -722,12 +722,12 @@
         set last_context [expr {[$package_id exists context] ? [$package_id context] : "::xo::cc"}]
         $package_id context [::xo::Context new -volatile]
         set object_name [$package_id set object]
-        #my log "cross package request got object=$object_name"
+        #:log "cross package request got object=$object_name"
         #
         # A user might force the language by preceding the
         # name with a language prefix.
         #
-        #my log "check '$object_name' for lang prefix"
+        #:log "check '$object_name' for lang prefix"
         if {![regexp {^..:} $object_name]} {
           if {![info exists lang]} {
             set lang [:default_language]
@@ -746,7 +746,7 @@
       set page [$package_id resolve_page -use_package_path $(search) $(page_name) __m]
       $package_id context $last_context
     }
-    #my log "returning $page"
+    #:log "returning $page"
     return $page
   }
 
@@ -788,7 +788,7 @@
     #if {"::xowiki::Page" in [$object info precedence]} {
     #  append msg " [$object name] [$object package_id] [$object physical_package_id]"
     #}
-    #my msg $msg
+    #:msg $msg
     if {[$object istype ::xowiki::Package]} {
       set base ${:package_url}
       if {[info exists link]} {
@@ -802,11 +802,11 @@
         set base $link
       } else {
         set base ${:url}
-        #my msg "base = '${:url}'"
+        #:msg "base = '${:url}'"
       }
       lappend args [list m $method]
       set computed_link [uplevel export_vars -base [list $base] [list $args]]
-      #my msg "computed_link = '$computed_link'"
+      #:msg "computed_link = '$computed_link'"
     }
     if {$with_entities} {
       regsub -all & $computed_link "&amp;" computed_link
@@ -815,12 +815,12 @@
     # provide links based in untrusted_user_id
     set party_id [::xo::cc set untrusted_user_id]
     if {[info exists privilege]} {
-      #my log "-- checking priv $privilege for [self args] from id ${:id}"
+      #:log "-- checking priv $privilege for [self args] from id ${:id}"
       set granted [expr {$privilege eq "public" ? 1 :
                          [::xo::cc permission -object_id ${:id} -privilege $privilege -party_id $party_id] }]
     } else {
       # determine privilege from policy
-      #my msg "-- check permissions from ${:id} of object $object $method"
+      #:msg "-- check permissions from ${:id} of object $object $method"
       ad_try {
         set granted [:check_permissions \
                          -user_id $party_id \
@@ -830,9 +830,9 @@
         ns_log error "error in check_permissions: $errorMsg"
         set granted 0
       }
-      #my msg "--p ${:id} check_permissions $object $method ==> $granted"
+      #:msg "--p ${:id} check_permissions $object $method ==> $granted"
     }
-    #my log "granted=$granted $computed_link"
+    #:log "granted=$granted $computed_link"
     if {$granted} {
       return $computed_link
     }
@@ -845,11 +845,11 @@
                              -parent_id $parent_id \
                              -forms $form \
                              -package_id ${:id}] 0]
-    #my log "instantiate_forms -parent_id $parent_id -forms $form => $form_id "
+    #:log "instantiate_forms -parent_id $parent_id -forms $form => $form_id "
     if {$form_id ne ""} {
       if {$parent_id eq ""} {unset parent_id}
       set form_link [$form_id pretty_link]
-      #my msg "$form -> $form_id -> $form_link -> [:make_link -link $form_link $form_id \
+      #:msg "$form -> $form_id -> $form_link -> [:make_link -link $form_link $form_id \
           #            create-new return_url title parent_id name nls_language]"
       return [:make_link -link $form_link $form_id \
                   create-new return_url title parent_id name nls_language]
@@ -905,7 +905,7 @@
     #
     ::xo::cc invoke_object $page_or_package
     
-    #my log "--r resolve_page '${:object}' => $page_or_package"
+    #:log "--r resolve_page '${:object}' => $page_or_package"
     if {$page_or_package ne ""} {
       #
       # Check, of the target is a symbolic link
@@ -924,10 +924,10 @@
           set deref [:query_parameter deref]
         }
         
-        #my log "invoke on LINK <$method> default deref $deref"
+        #:log "invoke on LINK <$method> default deref $deref"
         if {$deref} {
           set target [$page_or_package get_target_from_link_page]
-          #my log "delegate $method from $page_or_package [$page_or_package name] to $target [$target name]"
+          #:log "delegate $method from $page_or_package [$page_or_package name] to $target [$target name]"
           if {$target ne ""} {
             $target set __link_source $page_or_package
             set page_or_package $target
@@ -1009,7 +1009,7 @@
       ad_script_abort
     }
     set [expr {$revision_id ? "item_id" : "revision_id"}] 0
-    #my log "--instantiate item_id $item_id revision_id $revision_id"
+    #:log "--instantiate item_id $item_id revision_id $revision_id"
     return [::xo::db::CrClass get_instance_from_db -item_id $item_id -revision_id $revision_id]
   }
 
@@ -1032,7 +1032,7 @@
     if {![info exists lang]} {
       set lang [:default_language]
     }
-    #my log "resolve_page '$object', default-lang $lang"
+    #:log "resolve_page '$object', default-lang $lang"
 
     #
     # First, resolve package level methods,
@@ -1045,7 +1045,7 @@
       #
       set exported [${:policy} defined_methods Package]
       foreach m $exported {
-        #my log "--QP :exists_query_parameter $m = [:exists_query_parameter $m] || [:exists_form_parameter $m]"
+        #:log "--QP :exists_query_parameter $m = [:exists_query_parameter $m] || [:exists_form_parameter $m]"
         if {[:exists_query_parameter $m] || [:exists_form_parameter $m]} {
           set method $m  ;# determining the method, similar file extensions
           return [self]
@@ -1059,7 +1059,7 @@
       return ""
     }
 
-    #my log "--o object is '$object'"
+    #:log "--o object is '$object'"
     if {$object eq ""} {
       #
       # We have no object, but as well no method callable on the
@@ -1075,7 +1075,7 @@
                           method [:query_parameter m]]
       } else {
         set object [${:id} get_parameter index_page "index"]
-        #my log "--o object after getting index_page is '$object'"
+        #:log "--o object after getting index_page is '$object'"
       }
     }
 
@@ -1084,7 +1084,7 @@
     #
     if {![info exists (item_id)]} {
       array set "" [:item_info_from_url -with_package_prefix false -default_lang $lang $object]
-      #my log "item_info_from_url returns [array get {}]"
+      #:log "item_info_from_url returns [array get {}]"
     }
 
     if {$(item_id) ne 0} {
@@ -1104,7 +1104,7 @@
       return $page
     }
     if {$simple} { return ""}
-    #my log "NOT found object=$object"
+    #:log "NOT found object=$object"
 
     # try standard page
     set standard_page [${:id} get_parameter $(stripped_name)_page]
@@ -1120,15 +1120,15 @@
                     -default_lang $lang \
                     -parent_id [:folder_id] \
                     $standard_page]
-      #my log "--o resolving standard_page '$standard_page' returns $page"
+      #:log "--o resolving standard_page '$standard_page' returns $page"
       if {$page ne ""} {
         return $page
       }
       # Maybe we are calling from a different language, but the
       # standard page with en: was already instantiated.
       #set standard_page "en:$stripped_object"
       #set page [:resolve_request -default_lang en -path $standard_page method]
-      #my msg "resolve -default_lang en -path $standard_page returns --> $page"
+      #:msg "resolve -default_lang en -path $standard_page returns --> $page"
       #if {$page ne ""} {
       #  return $page
       #}
@@ -1137,35 +1137,35 @@
     # Maybe, a prototype page was imported with language en:, but the current language is different
     #if {$lang ne "en"} {
     #  set page [:resolve_request -default_lang en -path $stripped_object method]
-    #  #my msg "resolve -default_lang en -path $stripped_object returns --> $page"
+    #  #:msg "resolve -default_lang en -path $stripped_object returns --> $page"
     #  if {$page ne ""} {
     #     return $page
     #  }
     #}
 
     if {$use_package_path} {
       # Check for this page along the package path
-      #my msg "check along package path"
+      #:msg "check along package path"
       foreach package [:package_path] {
         set page [$package resolve_page -simple true -lang $lang $object method]
         if {$page ne ""} {
-          #my msg "set_resolve_context inherited -package_id ${:id} -parent_id [:folder_id]"
+          #:msg "set_resolve_context inherited -package_id ${:id} -parent_id [:folder_id]"
           $page set_resolve_context -package_id ${:id} -parent_id [:folder_id]
           return $page
         }
       }
-      #my msg "package path done [array get {}]"
+      #:msg "package path done [array get {}]"
     }
 
     set page [::xowiki::Package get_site_wide_page -name en:$(stripped_name)]
-    #my msg "get_site_wide_page for en:'$(stripped_name)' returned '$page' (stripped name)"
+    #:msg "get_site_wide_page for en:'$(stripped_name)' returned '$page' (stripped name)"
     if {$page ne ""} {
-      #my msg "set_resolve_context site-wide -package_id ${:id} -parent_id [:folder_id]"
+      #:msg "set_resolve_context site-wide -package_id ${:id} -parent_id [:folder_id]"
       $page set_resolve_context -package_id ${:id} -parent_id [:folder_id]
       return $page
     }
 
-    #my log "try to import a prototype page for '$(stripped_name)'"
+    #:log "try to import a prototype page for '$(stripped_name)'"
     if {$(stripped_name) ne ""} {
       set page [:www-import-prototype-page -lang $lang -add_revision false $(stripped_name)]
     }
@@ -1190,7 +1190,7 @@
     # from the remaining URLs.
     #
     foreach package_instance_url $package_path {
-      #my msg "compare $package_instance_url eq $package_url"
+      #:msg "compare $package_instance_url eq $package_url"
       if {$package_instance_url eq $package_url} continue
       lappend packages ::[::xowiki::Package initialize \
                               -url $package_instance_url/${:object} \
@@ -1200,7 +1200,7 @@
     set p [lsearch $packages ::${:id}]
     if {$p > -1} {set packages [lreplace $packages $p $p]}
 
-    #my msg "${:id} packages=$packages, p=$p"
+    #:msg "${:id} packages=$packages, p=$p"
     return $packages
   }
 
@@ -1260,7 +1260,7 @@
       if {$item_id != 0} {
         set name $stripped_name
         regexp {^(..):(.+)$} $name _ lang stripped_name
-        #my log "direct $stripped_name"
+        #:log "direct $stripped_name"
       }
     }
 
@@ -1281,7 +1281,7 @@
     if {$item_id == 0} {
       set name ${lang}:$stripped_name
       set item_id [::xo::db::CrClass lookup -name $name -parent_id $parent_id]
-      #my log "comp $name"
+      #:log "comp $name"
     }
     return [list item_id $item_id parent_id $parent_id \
                 lang $lang stripped_name $stripped_name name $name ]
@@ -1299,14 +1299,14 @@
     # (obtained via package_path).
     #
     array set "" [:get_package_id_from_page_name -default_lang $default_lang $name]
-    #my msg "result = [array get {}]"
+    #:msg "result = [array get {}]"
     if {![info exists (package_id)]} {
       return 0
     }
 
     if {$parent_id eq ""} {set parent_id [$(package_id) folder_id]}
     set item_id [::xo::db::CrClass lookup -name $(page_name) -parent_id $parent_id]
-    #my log "lookup $(page_name) $parent_id in package $(package_id) returns $item_id, parent_id $parent_id"
+    #:log "lookup $(page_name) $parent_id in package $(package_id) returns $item_id, parent_id $parent_id"
 
     # Test for "0" is only needed when we want to create the first root folder
     if {$item_id == 0 && $parent_id ne "0"} {
@@ -1318,15 +1318,15 @@
       if {[$p istype ::xowiki::FormPage] && [$p is_link_page] && [$p is_folder_page]} {
         set target [$p get_target_from_link_page]
         set target_package_id [$target package_id]
-        #my msg "SYMLINK LOOKUP from target-package $target_package_id source package $(package_id)"
+        #:msg "SYMLINK LOOKUP from target-package $target_package_id source package $(package_id)"
         set target_item_id [$target_package_id lookup \
                                 -use_package_path $use_package_path \
                                 -use_site_wide_pages $use_site_wide_pages \
                                 -default_lang $default_lang \
                                 -name $name \
                                 -parent_id [$target item_id]]
         if {$target_item_id != 0} {
-          #my msg "SYMLINK FIX $target_item_id set_resolve_context -package_id ${:id} -parent_id $parent_id"
+          #:msg "SYMLINK FIX $target_item_id set_resolve_context -package_id ${:id} -parent_id $parent_id"
           ::xo::db::CrClass get_instance_from_db -item_id $target_item_id
           $target_item_id set_resolve_context -package_id ${:id} -parent_id $parent_id
         }
@@ -1341,7 +1341,7 @@
       #
       foreach package [:package_path] {
         set item_id [$package lookup -name $name]
-        #my msg "lookup from package $package $name returns $item_id"
+        #:msg "lookup from package $package $name returns $item_id"
         if {$item_id != 0} break
       }
     }
@@ -1413,7 +1413,7 @@
                         -parent_id $parent_id \
                         -assume_folder [expr {[incr n] < $nr_elements}] \
                         $element]
-      #my msg "simple_item_ref $element => [array get {}]"
+      #:msg "simple_item_ref $element => [array get {}]"
       if {$(item_id) == 0} {
         set parent_id $(parent_id)
         break
@@ -1436,7 +1436,7 @@
     {-assume_folder:required false}
     element
   } {
-    #my log el=[string map [list \0 MARKER] $element]-assume_folder=$assume_folder,parent_id=$parent_id
+    #:log el=[string map [list \0 MARKER] $element]-assume_folder=$assume_folder,parent_id=$parent_id
     set (form) ""
     set use_default_lang 0
 
@@ -1451,21 +1451,21 @@
     } elseif {[regexp {^(..):([^:]{3,}?):(..):(.+)$} $element _ form_lang form (prefix) (stripped_name)]} {
       array set "" [list link_type "link" form "$form_lang:$form.form"]
       set name $(prefix):$(stripped_name)
-      #my msg "FIRST case name=$name, form=$form_lang:$form"
+      #:msg "FIRST case name=$name, form=$form_lang:$form"
     } elseif {[regexp {^(..):([^:]{3,}?):(.+)$} $element _ form_lang form (stripped_name)]} {
       array set "" [list link_type "link" form "$form_lang:$form.form" prefix $default_lang]
       set name $default_lang:$(stripped_name)
       set use_default_lang 1
-      #my msg "SECOND case name=$name, form=$form_lang:$form"
+      #:msg "SECOND case name=$name, form=$form_lang:$form"
     } elseif {[regexp {^([^:]{3,}?):(..):(.+)$} $element _ form (prefix) (stripped_name)]} {
       array set "" [list link_type "link" form "$default_lang:$form.form"]
       set name $(prefix):$(stripped_name)
-      #my msg "THIRD case name=$name, form=$default_lang:$form"
+      #:msg "THIRD case name=$name, form=$default_lang:$form"
     } elseif {[regexp {^([^:]{3,}?):(.+)$} $element _ form (stripped_name)]} {
       array set "" [list link_type "link" form "$default_lang:$form.form" prefix $default_lang]
       set name $default_lang:$(stripped_name)
       set use_default_lang 1
-      #my msg "FOURTH case name=$name, form=$default_lang:$form"
+      #:msg "FOURTH case name=$name, form=$default_lang:$form"
     } elseif {[regexp {^(..):(.+)$} $element _ (prefix) (stripped_name)]} {
       array set "" [list link_type "link"]
       set name $(prefix):$(stripped_name)
@@ -1499,7 +1499,7 @@
       array set "" [:item_info_from_id $folder_id]
       set item_id $folder_id
       set parent_id $(parent_id)
-      #my msg "SETTING item_id $item_id parent_id $parent_id // [array get {}]"
+      #:msg "SETTING item_id $item_id parent_id $parent_id // [array get {}]"
     } elseif {$element eq "." || $element eq ".\0"} {
       array set "" [:item_info_from_id $parent_id]
       set item_id $parent_id
@@ -1530,7 +1530,7 @@
                        -use_package_path $use_package_path \
                        -use_site_wide_pages $use_site_wide_pages \
                        -name $name -parent_id $parent_id]
-      #my log "${:id} lookup -use_package_path $use_package_path -name $name -parent_id $parent_id => $item_id"
+      #:log "${:id} lookup -use_package_path $use_package_path -name $name -parent_id $parent_id => $item_id"
 
       if {$item_id == 0} {
         #
@@ -1544,7 +1544,7 @@
                            -use_package_path $use_package_path \
                            -use_site_wide_pages $use_site_wide_pages \
                            -name $(stripped_name) -parent_id $parent_id]
-          #my msg "try again direct lookup, parent_id $parent_id $(stripped_name) => $item_id"
+          #:msg "try again direct lookup, parent_id $parent_id $(stripped_name) => $item_id"
           if {$item_id > 0} {array set "" [list prefix ""]}
         }
 
@@ -1567,7 +1567,7 @@
                            -use_package_path $use_package_path \
                            -use_site_wide_pages $use_site_wide_pages \
                            -name en:$(stripped_name) -parent_id $parent_id]
-          #my msg "try again in en en:$(stripped_name) => $item_id"
+          #:msg "try again in en en:$(stripped_name) => $item_id"
           if {$item_id > 0} {array set "" [list link_type "link" prefix en]}
         }
 
@@ -1603,7 +1603,7 @@
       }
     }
 
-    #my msg "return link_type $(link_type) prefix $(prefix) stripped_name $(stripped_name) form $(form) parent_id $parent_id item_id $item_id"
+    #:msg "return link_type $(link_type) prefix $(prefix) stripped_name $(stripped_name) form $(form) parent_id $parent_id item_id $item_id"
     return [list link_type $(link_type) prefix $(prefix) stripped_name $(stripped_name) \
                 form $(form) parent_id $parent_id item_id $item_id ]
   }
@@ -1645,7 +1645,7 @@
                          -parent_id [:folder_id] \
                          parent (stripped_name)]
 
-    #my msg "get_parent_and_name '$stripped_url' returns [array get {}]"
+    #:msg "get_parent_and_name '$stripped_url' returns [array get {}]"
 
     if {![regexp {^(download)/(.+)$} $(lang) _ (method) (lang)]} {
       set (method) ""
@@ -1680,7 +1680,7 @@
     }
     array set "" [:prefixed_lookup -parent_id $(parent_id) \
                       -default_lang $default_lang -lang $(lang) -stripped_name $(stripped_name)]
-    #my log "prefixed_lookup '$(stripped_name)' returns [array get {}]"
+    #:log "prefixed_lookup '$(stripped_name)' returns [array get {}]"
 
     if {$(item_id) == 0} {
       #
@@ -1697,7 +1697,7 @@
         $target set_resolve_context -package_id ${:id} -parent_id $link_id
         array set "" [list logical_package_id ${:id} logical_parent_id $link_id]
 
-        #my log "SYMLINK PREFIXED $target ([$target name]) set_resolve_context -package_id ${:id} -parent_id $link_id"
+        #:log "SYMLINK PREFIXED $target ([$target name]) set_resolve_context -package_id ${:id} -parent_id $link_id"
 
         array set "" [[$target package_id] prefixed_lookup -parent_id [$target item_id] \
                           -default_lang $default_lang -lang $(lang) -stripped_name $(stripped_name)]
@@ -1730,14 +1730,14 @@
     #
     # @return page object or empty ("").
     #
-    #my log "--get_page_from_item_ref [self args]"
+    #:log "--get_page_from_item_ref [self args]"
 
     if {$allow_cross_package_item_refs && [string match "//*" $link]} {
 
       # todo check: get_package_id_from_page_name uses a different lookup based on site nodes
 
       set referenced_package_id [:resolve_package_path $link rest_link]
-      #my log "get_page_from_item_ref $link recursive rl?[info exists rest_link] in $referenced_package_id"
+      #:log "get_page_from_item_ref $link recursive rl?[info exists rest_link] in $referenced_package_id"
       if {$referenced_package_id != 0 && $referenced_package_id != ${:id}} {
         # TODO: we have still to check, whether or not we want
         # site-wide-pages etc.  in cross package links, and if, under
@@ -1748,7 +1748,7 @@
         # parent_page for the search and turn off all page creation
         # facilities.
 
-        #my log cross-package
+        #:log cross-package
         return [$referenced_package_id get_page_from_item_ref \
                     -allow_cross_package_item_refs false \
                     -use_package_path false \
@@ -1766,27 +1766,27 @@
       set search_parent_id $parent_id
     }
 
-    #my log "my folder [:folder_id]"
+    #:log "my folder [:folder_id]"
 
     if {$search_parent_id eq ""} {
       set search_parent_id [:folder_id]
     }
     if {$parent_id eq ""} {
       set parent_id [:folder_id]
     }
-    #my log call-item_ref-on:$link-parent_id=$parent_id,search_parent_id=$search_parent_id
+    #:log call-item_ref-on:$link-parent_id=$parent_id,search_parent_id=$search_parent_id
     array set "" [:item_ref -normalize_name false \
                       -use_package_path $use_package_path \
                       -use_site_wide_pages $use_site_wide_pages \
                       -default_lang $default_lang \
                       -parent_id $search_parent_id \
                       $link]
 
-    #my msg  "[:instance_name] (root [:folder_id]) item-ref for '$link' search parent $search_parent_id, parent $parent_id, returns\n[array get {}]"
+    #:msg  "[:instance_name] (root [:folder_id]) item-ref for '$link' search parent $search_parent_id, parent $parent_id, returns\n[array get {}]"
     if {$(item_id)} {
       set page [::xo::db::CrClass get_instance_from_db -item_id $(item_id)]
       if {[$page package_id] ne ${:id} || [$page parent_id] != $(parent_id)} {
-        #my msg "set_resolve_context site_wide_pages ${:id} and -parent_id $parent_id"
+        #:msg "set_resolve_context site_wide_pages ${:id} and -parent_id $parent_id"
         $page set_resolve_context -package_id ${:id} -parent_id $parent_id
       }
       return $page
@@ -1803,7 +1803,7 @@
                     -name $(stripped_name) \
                     -parent_id $(parent_id) \
                     -package_id ${:id} ]
-      #my msg "import_prototype_page for '$(stripped_name)' => '$page'"
+      #:msg "import_prototype_page for '$(stripped_name)' => '$page'"
       if {$page ne ""} {
         # we want to be able to address the page via ::$item_id
         set page [::xo::db::CrClass get_instance_from_db -item_id [$page item_id]]
@@ -1857,7 +1857,7 @@
                                     } {
     set page ""
     set fn [get_server_root]/packages/$package_key/www/prototypes/$name.page
-    #my log "--W check $fn"
+    #:log "--W check $fn"
     if {[file readable $fn]} {
       # We have the file of the prototype page. We try to create
       # either a new item or a revision from definition in the file
@@ -1877,7 +1877,7 @@
       if {![$page istype ::xowiki::File]} {
         set nls_language [:get_nls_language_from_lang $lang]
         $page name [$page build_name -nls_language $nls_language]
-        #my log "--altering name of page $page to '[$page name]'"
+        #:log "--altering name of page $page to '[$page name]'"
         set fullName [$page name]
       }
       if {![$page exists title]} {
@@ -1888,14 +1888,14 @@
       $page initialize_loaded_object
 
       set p [$package_id get_page_from_name -name $fullName -parent_id $parent_id]
-      #my log "--get_page_from_name --> '$p'"
+      #:log "--get_page_from_name --> '$p'"
       if {$p eq ""} {
         # We have to create the page new. The page is completed with
         # missing vars on save_new.
-        #my log "--save_new of $page class [$page info class]"
+        #:log "--save_new of $page class [$page info class]"
         $page save_new
       } else {
-        #my log "--save revision $add_revision"
+        #:log "--save revision $add_revision"
         if {$add_revision} {
           # An old page exists already, make a revision.  Update the
           # existing page with all scalar variables from the prototype
@@ -1904,7 +1904,7 @@
             if {[$page array exists $v]} continue ;# don't copy arrays
             $p set $v [$page set $v]
           }
-          #my log "--save of $p class [$p info class]"
+          #:log "--save of $p class [$p info class]"
           $p save
         }
         set page $p
@@ -1928,7 +1928,7 @@
 
     foreach n {folder.form link.form page.form import-archive.form photo.form} {
       set item_id [::xo::db::CrClass lookup -name en:$n -parent_id $parent_id]
-      #my log "lookup en:$n => $item_id"
+      #:log "lookup en:$n => $item_id"
       if {!$item_id || $refetch} {
         set page [::xowiki::Package import_prototype_page \
                       -name $n \
@@ -1946,7 +1946,7 @@
 
   Package proc get_site_wide_page {-name:required} {
     set item_id [:lookup_side_wide_page -name $name]
-    #my ds "lookup from base objects $name => $item_id"
+    # :ds "lookup from base objects $name => $item_id"
     if {$item_id} {
       set page [::xo::db::CrClass get_instance_from_db -item_id $item_id]
       set package_id [$page package_id]
@@ -1965,7 +1965,7 @@
                      -package_id ${:id} -user_id [::xo::cc user_id] \
                      $object $method]
     if {$allowed} {
-      #my log "--p calling $object ([$object info class]) '$method'"
+      #:log "--p calling $object ([$object info class]) '$method'"
       $object www-$method {*}$options
     } else {
       :log "not allowed to call $object $method"
@@ -2035,10 +2035,10 @@
       #::xo::db::CrFolder register_content_types \
           #    -folder_id $folder_id \
           #    -content_types $content_types
-      #my log "returning from cache folder_id $folder_id"
+      #:log "returning from cache folder_id $folder_id"
       return $folder_id
     }]
-    #my log "returning from require folder_id $folder_id"
+    #:log "returning from require folder_id $folder_id"
     return $folder_id
   }
 
@@ -2081,7 +2081,7 @@
       and publish_status = 'ready'
       and page_id = o.object_id and o.package_id = :id
     }]
-    #my log "--reindex returns <$pages>"
+    #:log "--reindex returns <$pages>"
     foreach page_id $pages {
       #search::queue -object_id $page_id -event DELETE
       search::queue -object_id $page_id -event INSERT
@@ -2207,7 +2207,7 @@
     # :log $sql
 
     ::xo::dc foreach get_pages $sql {
-      #my log "--found $name"
+      #:log "--found $name"
       if {[string match "::*" $name]} continue
       if {$content_type eq "::xowiki::PageTemplate::"} continue
 
@@ -2259,7 +2259,7 @@
       set time [::xo::db::tcl_date $last_modified tz]
       set time "[clock format [clock scan $time] -format {%Y-%m-%dT%T}]${tz}:00"
 
-      #my log "--site_node::get_from_object_id -object_id $package_id"
+      #:log "--site_node::get_from_object_id -object_id $package_id"
       array set info [site_node::get_from_object_id -object_id $package_id]
 
       append content <sitemap> \n\
@@ -2307,7 +2307,7 @@
       ad_script_abort
     }
     set page [$object_type new -volatile -parent_id $parent_id -package_id ${:id}]
-    #my ds "parent_id of $page = [$page parent_id], cl=[$page info class] parent_id=$parent_id\n[$page serialize]"
+    # :ds "parent_id of $page = [$page parent_id], cl=[$page info class] parent_id=$parent_id\n[$page serialize]"
     if {$object_type eq "::xowiki::PageInstance"} {
       #
       # If we create a PageInstance via the ad_form based
@@ -2328,9 +2328,9 @@
       set source [$object_type get_instance_from_db -item_id $source_item_id]
       $page copy_content_vars -from_object $source
       set name "[::xowiki::autoname new -parent_id $source_item_id -name [$source name]]"
-      #my get_lang_and_name -name $name lang name
+      # :get_lang_and_name -name $name lang name
       $page set name $name
-      #my msg nls=[$page nls_language],source-nls=[$source nls_language],page=$page,name=$name
+      #:msg nls=[$page nls_language],source-nls=[$source nls_language],page=$page,name=$name
     } else {
       $page set name ""
     }
@@ -2429,7 +2429,7 @@
     # While the class specific methods are used from the
     # application pages, the package_level method is used from the admin pages.
     #
-    #my log "--D delete [self args]"
+    #:log "--D delete [self args]"
     #
     # if no item_id given, take it from the query parameter
     #
@@ -2439,7 +2439,7 @@
         ad_return_complaint 1 "invalid item_id"
         ad_script_abort
       }
-      #my log "--D item_id from query parameter $item_id"
+      #:log "--D item_id from query parameter $item_id"
     }
     #
     # if no name is given, take it from the query parameter
@@ -2463,7 +2463,7 @@
         set parent_id [::xo::db::CrClass get_parent_id -item_id $item_id]
       }
     }
-    #my msg item_id=$item_id/name=$name
+    #:msg item_id=$item_id/name=$name
 
     if {$item_id ne ""} {
       :log "--D trying to delete $item_id $name"
@@ -2819,7 +2819,7 @@
   #  } -set default_permission login
   #}
 
-  #my log "--set granted [policy4 check_permissions -user_id 0 -package_id 0 function f]"
+  #:log "--set granted [policy4 check_permissions -user_id 0 -package_id 0 function f]"
 
   #
   # an example with in_state condition...
Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v
diff -u -N -r1.50 -r1.51
--- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	9 Apr 2018 07:47:05 -0000	1.50
+++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	9 Apr 2018 07:58:06 -0000	1.51
@@ -293,9 +293,9 @@
       set clock [clock scan $publish_date]
 
       if {$last_user == $creation_user && $last_item == $item_id && $last_clock ne ""} {
-        #my log "--clockdiff = [expr {$last_clock - $clock }] $name [clock format $clock -format {%b %d %Y %X %Z} -gmt true]"
+        #:log "--clockdiff = [expr {$last_clock - $clock }] $name [clock format $clock -format {%b %d %Y %X %Z} -gmt true]"
         if {($last_clock - $clock) < 7500 } {
-          #my log "--clock ignore change due to cockdiff"
+          #:log "--clock ignore change due to cockdiff"
           continue
         }
       }
@@ -379,7 +379,7 @@
     set status [dict get $request status]
     set data [expr {[dict exists $request page] ? [dict get $request page] : ""}]
     
-    #my msg "statuscode = [$r set status_code], content_type=[$r set content_type]"
+    #:msg "statuscode = [$r set status_code], content_type=[$r set content_type]"
     #set f [open /tmp/feed w]; fconfigure $f -translation binary; puts $f [$r set data]; close $f
     # if {[$r exists status] && [$r set status] eq "canceled"} {
     #   set :errorMessage [$r set cancel_message]
Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -N -r1.74 -r1.75
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	25 Mar 2018 22:13:40 -0000	1.74
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	9 Apr 2018 07:58:06 -0000	1.75
@@ -35,24 +35,24 @@
      } {
     set form_item_ids [list]
     foreach t [split $forms |] {
-      #my log "trying to get $t // parent_id $parent_id"
+      #:log "trying to get $t // parent_id $parent_id"
       set page [$package_id get_page_from_item_ref \
                     -use_prototype_pages true \
                     -use_package_path true \
                     -parent_id $parent_id \
                     $t]
-      #my log "weblog form $t => $page"
+      #:log "weblog form $t => $page"
       if {$page ne ""} {
         lappend form_item_ids [$page item_id]
       }
     }
-    #my log "instantiate: parent_id=$parent_id-forms=$forms -> $form_item_ids"
+    #:log "instantiate: parent_id=$parent_id-forms=$forms -> $form_item_ids"
     return $form_item_ids
   }
 
   ::xowiki::Weblog instproc init {} {
     
-    #my log "--W starting"
+    #:log "--W starting"
     set folder_id [::${:package_id} folder_id]
     set :filter_msg  ""
     set query_parm ""
@@ -98,7 +98,7 @@
       set query_parm "&category_id=${:category_id}"
       set query [::xo::update_query $query category_id ${:category_id}]
     }
-    #my msg "tag=${:tag}"
+    #:msg "tag=${:tag}"
     if {${:tag} ne ""} {
       ${:package_id} validate_tag ${:tag}
       set :filter_msg "Filtered by your tag ${:tag}"
@@ -108,7 +108,7 @@
         tags.user_id = [::xo::cc user_id]" 
       set query_parm "&tag=[ad_urlencode ${:tag}]"
     }
-    #my msg "ptag=${:ptag}"
+    #:msg "ptag=${:ptag}"
     if {${:ptag} ne ""} {
       ${:package_id} validate_tag ${:ptag}
       set :filter_msg "Filtered by popular tag ${:ptag}"
@@ -118,7 +118,7 @@
       set query_parm "&ptag=[ad_urlencode ${:ptag}]"
       set query [::xo::update_query $query ptag ${:ptag}]
     }
-    #my msg filter_msg=${:filter_msg} 
+    #:msg filter_msg=${:filter_msg} 
     if {${:name_filter} ne ""} {
       append extra_where_clause "and ci.name ~ E'${:name_filter}' "
     }
@@ -161,7 +161,7 @@
     if {${:locale} ne ""} {
       #set :locale "default+system"
       lassign [::xowiki::Includelet locale_clause -revisions bt -items ci ${:package_id} ${:locale}] :locale locale_clause
-      #my msg "--L locale_clause=$locale_clause"
+      #:msg "--L locale_clause=$locale_clause"
       append extra_where_clause $locale_clause
     }
     
@@ -203,7 +203,7 @@
                        [$base_type instance_select_query \
                             -from_clause $extra_from_clause \
                             {*}$sqlParams -count true]]
-    #my log count=${:nr_items}
+    #:log count=${:nr_items}
 
     #
     # Obtain the set of answers
@@ -253,15 +253,15 @@
           $p set description "Render Error ($errorMsg) $revision_id $name $title"
         }
         if {[info exists :entry_flag]} {$p unset [:entry_flag]}
-        #my log "--W $p render (mixins=[$p info mixin]) => $description"
+        #:log "--W $p render (mixins=[$p info mixin]) => $description"
       }
       $p set pretty_date $pretty_date
       $p set publish_date $publish_date
-      #my log "--W setting $p set publish_date $publish_date"
-      #$p proc destroy {} {my log "--Render temporal object destroyed"; next}
+      #:log "--W setting $p set publish_date $publish_date"
+      #$p proc destroy {} {:log "--Render temporal object destroyed"; next}
       #ns_log notice "--W Render object $p DONE $revision_id $name $title "
       $p mixin add ${:entry_renderer}
-      #my log "--W items=${:items}, added mixin ${:entry_renderer} to $p, has now <[$p info mixin]>"
+      #:log "--W items=${:items}, added mixin ${:entry_renderer} to $p, has now <[$p info mixin]>"
       ${:items} add $p
     }
     array set smsg {1 full 0 summary}
@@ -294,18 +294,18 @@
         set :prev_page_link [::xo::cc url]?$query
       }
     }
-    #my proc destroy {} {my log "--W"; next}
+    #my proc destroy {} {:log "--W"; next}
     
     if {${:sort_composite} ne ""} {
       lassign [split ${:sort_composite} ,] kind att direction
       if {$kind eq "method"} {${:items} mixin add ::xo::OrderedComposite::MethodCompare}
       ${:items} orderby -order [expr {$direction eq "asc" ? "increasing" : "decreasing"}] $att
     }
-    #my log "--W done"
+    #:log "--W done"
   }
 
   ::xowiki::Weblog instproc render {} {
-    #my log "--W begin"
+    #:log "--W begin"
     #
     # We need the following CSS file for rendering
     #
@@ -315,7 +315,7 @@
 
     set content [${:items} render]
     ${:items} destroy_on_cleanup
-    #my log "--W end"
+    #:log "--W end"
     return $content
   }
   
Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -N -r1.141 -r1.142
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	21 Mar 2018 19:39:52 -0000	1.141
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	9 Apr 2018 07:58:06 -0000	1.142
@@ -71,7 +71,7 @@
         set s [${:data} get_rich_text_spec $__field ""]
       }
       if {$s ne ""} {
-        #my msg "we got richtext spec for $__field = '$s'"
+        #:msg "we got richtext spec for $__field = '$s'"
         set __spec $s
         set __wspec [lindex $__spec 0]
         # old style folder spec substitution. ugly.
@@ -83,7 +83,7 @@
             if {$__name eq "options"} {lappend __value {*}[:folderspec]}
             lappend __newspec [list $__name $__value]
           }
-          #my msg "--F rewritten spec is '$__newspec'"
+          #:msg "--F rewritten spec is '$__newspec'"
           set __spec $__newspec
         }
       } elseif {[lindex $__wspec 0] eq "="} {
@@ -120,7 +120,7 @@
         set __spec [string map {\[ \\[ \] \\] \$ \\$ \\ \\\\} $__spec]
       }
 
-      #my msg "--F field <$__field> = $__spec"
+      #:msg "--F field <$__field> = $__spec"
       append __fields [list $__spec] \n
     }
 
@@ -329,7 +329,7 @@
   #
   #   WikiForm instproc set_form_data {} {
   #     next
-  #     #my msg "name in form=[:var name]"
+  #     #:msg "name in form=[:var name]"
   #     set name_in_form [:var name]
   #     if {[regexp {^..:(.*)$} $name_in_form _ stripped_name]} {
   #       # use stripped "name" in form to avoid possible confusions
@@ -394,7 +394,7 @@
       }
     }
 
-    #my log "v=[ad_acs_version] 5.2] compare: [apm_version_names_compare [ad_acs_version] 5.2]"
+    #:log "v=[ad_acs_version] 5.2] compare: [apm_version_names_compare [ad_acs_version] 5.2]"
     if {[apm_version_names_compare [ad_acs_version] 5.3.0d4] == 1} {
       application_data_link::update_links_from \
           -object_id [${:data} set item_id] \
@@ -411,7 +411,7 @@
     foreach f [:field_list] {
       set s [${:data} find_slot $f] 
       if {$s ne "" && [$s exists default] && [$s default] ne ""} {
-        #my msg "new_request $f default = '[$s default]'"
+        #:msg "new_request $f default = '[$s default]'"
         ${:data} set $f [$s default]
       }
     }
@@ -496,7 +496,7 @@
   }
 
   FileForm instproc get_uploaded_file {} {
-    #my log "--F... [ns_conn url] [ns_conn query] form vars = [ns_set array [ns_getform]]"
+    #:log "--F... [ns_conn url] [ns_conn query] form vars = [ns_set array [ns_getform]]"
     set upload_file [${:data} form_parameter upload_file]
     # :log "--F... upload_file = $upload_file"
     if {$upload_file ne "" && $upload_file ne "{}"} {
@@ -509,7 +509,7 @@
           || $mime_type eq "application/octet-stream" 
           || $mime_type eq "application/force-download"} {
         set guessed_mime_type [::xowiki::guesstype $upload_file]
-        #my msg guess=$guessed_mime_type
+        #:msg guess=$guessed_mime_type
         if {$guessed_mime_type ne "*/*"} {
           set mime_type $guessed_mime_type
         }
@@ -519,12 +519,12 @@
       # :log "--F no upload_file provided [lsort [${:data} info vars]]"
       if {[${:data} exists mime_type]} {
         :log "--mime_type=[${:data} set mime_type]"
-        #my log "   text=[${:data} set text]"
+        #:log "   text=[${:data} set text]"
         regexp {^[^:]+:(.*)$} [${:data} set name] _ upload_file
         ${:data} set upload_file $upload_file
         ${:data} set import_file [${:data} full_file_name]
         # :log "--F upload_file $upload_file  import_file [${:data} full_file_name]"
-        #my log "   import_type=[${:data} set import_file]"
+        #:log "   import_type=[${:data} set import_file]"
       } 
     } else {
       # :log "--F no name and no upload file"
@@ -622,7 +622,7 @@
       if {$name eq "::[${:data} set parent_id]"} {
         my f.name  "= inform,help_text="
         :validate {{name {1} {dummy}} }
-        #my log "--e don't validate folder id - parent_id = [${:data} set parent_id]"
+        #:log "--e don't validate folder id - parent_id = [${:data} set parent_id]"
       }
     }
     next
@@ -679,7 +679,7 @@
   }
   PageInstanceForm instproc set_submit_link_edit {} {
     set object_type [[${:data} info class] object_type]
-    #my log "-- data=${:data} cl=[${:data} info class] ot=$object_type"
+    #:log "-- data=${:data} cl=[${:data} info class] ot=$object_type"
     set item_id [${:data} set item_id]
     set page_template [${:data} form_parameter page_template]
     if {[${:data} exists_query_parameter return_url]} {
@@ -718,7 +718,7 @@
   PageInstanceEditForm instproc new_data {} {
     set __vars {folder_id item_id page_template return_url}
     set object_type [[${:data} info class] object_type]
-    #my log "-- cl=[${:data} info class] ot=$object_type $__vars"
+    #:log "-- cl=[${:data} info class] ot=$object_type $__vars"
     foreach __v $__vars {set $__v [${:data} from_parameter $__v] ""}
     set item_id [next]
 
@@ -794,7 +794,7 @@
 
     :edit_page_title [${:data} get_from_template title]
     next
-    #my log "--fields = [:fields]"
+    #:log "--fields = [:fields]"
   }
 
   proc ::xowiki::validate_form_text {} {
@@ -811,7 +811,7 @@
     #ns_log notice "--validate_form_content '$content' clean='$clean_content', \
         #    stripped='[string trim $clean_content]'"
     if {[string trim $clean_content] eq ""} { set text [list "" $mime]}
-    #my log "final text='$text'"
+    #:log "final text='$text'"
     return 1
   }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.510 -r1.511
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 Apr 2018 07:47:05 -0000	1.510
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 Apr 2018 07:58:06 -0000	1.511
@@ -658,7 +658,7 @@
       append :__map_command \n $cmd
     }
     set :__category_map [array get cm]
-    #my log "cmd=$cmd"
+    #:log "cmd=$cmd"
   }
 
   Page instproc build_instance_attribute_map {form_fields} {
@@ -669,19 +669,19 @@
     # associative list (attribute/value pairs) for form-field attributes.
     #
     #foreach f $form_fields {lappend fns [list [$f name] [$f info class]]}
-    #my msg "page [:name] build_instance_attribute_map $fns"
+    #:msg "page [:name] build_instance_attribute_map $fns"
     if {[info exists :__instance_attribute_map]} {
       array set cm ${:__instance_attribute_map}
     }
     foreach f $form_fields {
       set multiple [expr {[$f exists multiple] ? [$f set multiple] : 0}]
-      #my msg "$f [$f name] cat_tree [$f exists category_tree] is fc: [$f exists is_category_field]"
+      #:msg "$f [$f name] cat_tree [$f exists category_tree] is fc: [$f exists is_category_field]"
       if {[$f exists category_tree] && [$f exists is_category_field]} {
-        #my msg "page [:name] field [$f name] is a category_id from [$f category_tree]"
+        #:msg "page [:name] field [$f name] is a category_id from [$f category_tree]"
         set cm([$f name]) [list category [$f category_tree] $multiple]
         :category_export [$f category_tree]
       } elseif {[$f exists is_party_id]} {
-        #my msg "page [:name] field [$f name] is a party_id"
+        #:msg "page [:name] field [$f name] is a party_id"
         set cm([$f name]) [list party_id $multiple]
       } elseif {[$f istype "::xowiki::formfield::file"]} {
         set cm([$f name]) [list file 0]
@@ -698,7 +698,7 @@
     if {[info exists $key]} return
 
     # ok, it is the first request
-    #my msg "... catetegoy_import [self args]"
+    #:msg "... catetegoy_import [self args]"
 
     # Do we have a tree with the specified named mapped?
     set tree_ids [::xowiki::Category get_mapped_trees -object_id ${:package_id} -locale $locale \
@@ -722,7 +722,7 @@
       for {set l 1} {$l <= $level} {incr l} {append node_name /$names($l)}
       set ::__xowiki_reverse_category_map($node_name) $category_id
     }
-    #my msg "... catetegoy_import reverse map [array names ::__xowiki_reverse_category_map]"
+    #:msg "... catetegoy_import reverse map [array names ::__xowiki_reverse_category_map]"
     # mark the tree with this name as already imported
     set $key 1
   }
@@ -731,7 +731,7 @@
   Form instproc marshall {{-mode export}} {
     #set form_fields [:create_form_fields_from_form_constraints \
                                  #                     [:get_form_constraints]]
-    #my log "--ff=$form_fields"
+    #:log "--ff=$form_fields"
     #my build_instance_attribute_map $form_fields
     next
   }
@@ -804,11 +804,11 @@
       array set multiple_index [list category 2 party_id 1 file 1]
       set ia [list]
       foreach {name value} [:instance_attributes] {
-        #my log "marshall check $name $value [info exists use($name)]"
+        #:log "marshall check $name $value [info exists use($name)]"
         if {[info exists use($name)]} {
           set map_type [lindex $use($name) 0]
           set multiple [lindex $use($name) $multiple_index($map_type)]
-          #my log "+++ marshall check $name $value use <$use($name)> m=?$multiple"
+          #:log "+++ marshall check $name $value use <$use($name)> m=?$multiple"
           if {$multiple} {
             lappend ia $name [:map_values $map_type $value]
           } else {
@@ -820,7 +820,7 @@
         }
       }
       set :instance_attributes $ia
-      #my log "+++ setting instance_attributes $ia"
+      #:log "+++ setting instance_attributes $ia"
     }
     set old_assignee [:assignee]
     set :assignee  [:map_party -property assignee $old_assignee]
@@ -930,7 +930,7 @@
     # default value
     if {![info exists :page_order]} {set :page_order ""}
     set is_folder_page [:is_folder_page]
-    #my msg "is-folder-page [:name] => $is_folder_page"
+    #:msg "is-folder-page [:name] => $is_folder_page"
     if {$is_folder_page} {
       # reset names if necessary (e.g. import from old releases)
       set :name [:build_name]
@@ -945,7 +945,7 @@
       }
     }
     # in the general case, no more actions required
-    #my msg "demarshall [:name] DONE"
+    #:msg "demarshall [:name] DONE"
   }
 
   File instproc demarshall {args} {
@@ -1002,7 +1002,7 @@
     # mapped here again to internal representations
     :upvar $category_ids_name category_ids
     if {[info exists ::__xowiki_reverse_category_map($value)]} {
-      #my msg "map value '$value' (category tree: $use($name)) of [:name] to an ID"
+      #:msg "map value '$value' (category tree: $use($name)) of [:name] to an ID"
       lappend category_ids $::__xowiki_reverse_category_map($value)
       return $::__xowiki_reverse_category_map($value)
     } elseif {$map_type eq "party_id"} {
@@ -1029,12 +1029,12 @@
     # to categorize this objects in the source instance.
     set category_ids [list]
 
-    #my msg "[:name] check cm=[info exists ::__xowiki_reverse_category_map] && iam=[info exists :__instance_attribute_map]"
+    #:msg "[:name] check cm=[info exists ::__xowiki_reverse_category_map] && iam=[info exists :__instance_attribute_map]"
 
     if {[info exists ::__xowiki_reverse_category_map]
         && [info exists :__instance_attribute_map]
       } {
-      #my msg "we have a instance_attribute_map"
+      #:msg "we have a instance_attribute_map"
 
       #
       # replace all symbolic category values by the mapped IDs
@@ -1043,9 +1043,9 @@
       array set use ${:__instance_attribute_map}
       array set multiple_index [list category 2 party_id 1 file 1]
       foreach {name value} [:instance_attributes] {
-        #my msg "use($name) --> [info exists use($name)]"
+        #:msg "use($name) --> [info exists use($name)]"
         if {[info exists use($name)]} {
-          #my msg "try to map value '$value' (category tree: $use($name))"
+          #:msg "try to map value '$value' (category tree: $use($name))"
           set map_type [lindex $use($name) 0]
           set multiple [lindex $use($name) $multiple_index($map_type)]
           if {$multiple eq ""} {set multiple 1}
@@ -1064,7 +1064,7 @@
         }
       }
       set :instance_attributes $ia
-      #my msg  "[:name] saving instance_attributes $ia"
+      #:msg  "[:name] saving instance_attributes $ia"
     }
     set r [next]
     set :__category_ids [lsort -unique $category_ids]
@@ -1091,7 +1091,7 @@
     # *weblog, the method "edit" is only allowed
     # for package admins.
     #
-    #my msg "query_context='$query_context', value='$value'"
+    #:msg "query_context='$query_context', value='$value'"
     if {[llength $value] != 2} {
       error "two arguments for match required, [llength $value] passed (arguments='$value')"
     }
@@ -1119,7 +1119,7 @@
     # weblog or index, the method "edit" is only allowed
     # for package admins.
     #
-    #my msg "query_context='$query_context', value='$value'"
+    #:msg "query_context='$query_context', value='$value'"
     if {[llength $value] != 2} {
       error "two arguments for regexp required, [llength $value] passed (arguments='$value')"
     }
@@ -1331,7 +1331,7 @@
       set link_type "unresolved"
       set cross_package 0
     }
-    #my msg [list item_ref $item_ref item_id $item_id link_type $link_type cross_package $cross_package]
+    #:msg [list item_ref $item_ref item_id $item_id link_type $link_type cross_package $cross_package]
     return [list item_ref $item_ref item_id $item_id link_type $link_type cross_package $cross_package]
   }
 
@@ -1573,7 +1573,7 @@
     set stripped_name $name
     regexp {^..:(.*)$} $name _ stripped_name
 
-    #my msg "$name / '$stripped_name'"
+    #:msg "$name / '$stripped_name'"
     # prepend the language prefix only, if the entry is not empty
     if {$stripped_name ne ""} {
       if {[:is_folder_page] || [:is_link_page]} {
@@ -1613,7 +1613,7 @@
         set :physical_package_id ${:package_id}
       }
       set :package_id $package_id
-      #my msg "doing extra require on ${:physical_package_id}"
+      #:msg "doing extra require on ${:physical_package_id}"
       #::xowiki::Package require ${:physical_package_id}
     }
     if {[info exists item_id] && ${:item_id} != $item_id} {
@@ -1842,7 +1842,7 @@
       # there must be something syntactically wrong
       return [:error_in_includelet $arg [_ xowiki.error-includelet-dash_syntax_invalid]]
     }
-    #my msg "includelet: [lindex $arg 0], caller parms ? '[lrange $arg 1 end]'"
+    #:msg "includelet: [lindex $arg 0], caller parms ? '[lrange $arg 1 end]'"
 
     # the include is either a includelet class, or a wiki page
     if {[:isclass ::xowiki::includelet::$page_name]} {
@@ -1928,7 +1928,7 @@
         set html [:error_during_render [_ xowiki.error-includelet-error_during_render]]
       }
     }
-    #my log "--include includelet returns $html"
+    #:log "--include includelet returns $html"
     return $html
   }
 
@@ -2047,7 +2047,7 @@
     } else {
       # we have a direct (adp-less include)
       set html [:include [:unescape $arg]]
-      #my log "--include includelet returns $html"
+      #:log "--include includelet returns $html"
       incr ::xowiki_inclusion_depth -1
       return $html$ch2
     }
@@ -2106,10 +2106,10 @@
     }
 
     set normalized_name [${:package_id} normalize_name $stripped_name]
-    #my msg "input: [self args] - lang=[:lang], [:nls_language]"
+    #:msg "input: [self args] - lang=[:lang], [:nls_language]"
     if {$lang  eq ""}   {set lang [:lang]}
     if {$name  eq ""}   {set name $lang:$normalized_name}
-    #my msg result=[list name $name lang $lang normalized_name $normalized_name anchor $anchor]
+    #:msg result=[list name $name lang $lang normalized_name $normalized_name anchor $anchor]
     return [list name $name lang $lang normalized_name $normalized_name anchor $anchor query $query]
   }
 
@@ -2140,7 +2140,7 @@
   }
 
   Page instproc create_link {arg} {
-    #my msg [self args]
+    #:msg [self args]
     set label $arg
     set link $arg
     set options ""
@@ -2226,7 +2226,7 @@
                         -default_lang [:lang] \
                         -parent_id [:physical_item_id] \
                         $(link)]
-      #my log "SELF-LINK returns [array get {}]"
+      #:log "SELF-LINK returns [array get {}]"
 
     } else {
       #
@@ -2239,7 +2239,7 @@
                         $(link)]
     }
 
-    #my log "link '$(link)' package_id $package_id ${:package_id} => [array get {}]"
+    #:log "link '$(link)' package_id $package_id ${:package_id} => [array get {}]"
 
     if {$label eq $arg} {set label $(link)}
 
@@ -2363,7 +2363,7 @@
     #
     set baseclass [expr {[[:info class] exists RE] ? [:info class] : [self class]}]
     $baseclass instvar RE markupmap
-    #my log "-- baseclass for RE = $baseclass"
+    #:log "-- baseclass for RE = $baseclass"
 
     #
     # secondly, iterate line-wise over the text
@@ -2382,7 +2382,7 @@
       append output $l \n
       set l ""
     }
-    #my log "--substitute_markup returns $output"
+    #:log "--substitute_markup returns $output"
     return $output
   }
 
@@ -2392,7 +2392,7 @@
     # The provided content and the returned result are strings
     # containing HTML.
     #
-    #my msg "--adp_subst in [:name] vars=[:info vars]"
+    #:msg "--adp_subst in [:name] vars=[:info vars]"
     foreach __v [:info vars] {
       if {[info exists $__v]} continue
       #ns_log notice "import instvar $__v into current scope"
@@ -2420,7 +2420,7 @@
 
     set __vars [info vars]
     regsub -all [template::adp_variable_regexp] $content {\1@\2;noquote@} content_noquote
-    #my log "--adp before adp_eval '[template::adp_level]'"
+    #:log "--adp before adp_eval '[template::adp_level]'"
 
     set __l [string length $content]
     try {
@@ -2461,7 +2461,7 @@
       }
       append __template_variables__ "</ul>\n"
       set ::template::parse_level $my_parse_level
-      #my log "--adp after adp_eval '[template::adp_level]' mpl=$my_parse_level"
+      #:log "--adp after adp_eval '[template::adp_level]' mpl=$my_parse_level"
       set template_value "<div class='errorMsg'>Error in Page $name: $__errMsg</div>$content<p>Possible values are$__template_variables__"
     }
     return $template_value
@@ -2486,7 +2486,7 @@
   }
 
   Page instproc render_content {} {
-    #my log "-- '${:text}'"
+    #:log "-- '${:text}'"
     lassign ${:text} html mime
     if {[:render_adp]} {
       set html [:adp_subst $html]
@@ -2502,16 +2502,16 @@
   Page instproc get_rich_text_spec {field_name default} {
     set package_id ${:package_id}
     set spec ""
-    #my msg WidgetSpecs=[$package_id get_parameter WidgetSpecs]
+    #:msg WidgetSpecs=[$package_id get_parameter WidgetSpecs]
     foreach {s widget_spec} [$package_id get_parameter WidgetSpecs] {
       lassign [split $s ,] page_name var_name
       # in case we have no name (edit new page) we use the first value or the default.
       set name [expr {[info exists :name] ? ${:name} : $page_name}]
-      #my msg "--w T.name = '$name' var=$page_name ([string match $page_name $name]), $var_name $field_name ([string match $var_name $field_name])"
+      #:msg "--w T.name = '$name' var=$page_name ([string match $page_name $name]), $var_name $field_name ([string match $var_name $field_name])"
       if {[string match $page_name $name] &&
           [string match $var_name $field_name]} {
         set spec $widget_spec
-        #my msg "setting spec to $spec"
+        #:msg "setting spec to $spec"
         break
       }
     }
@@ -2539,7 +2539,7 @@
   }
 
   Page instproc references_update {references} {
-    #my msg $references
+    #:msg $references
     set item_id ${:item_id}
     ::xo::dc dml delete_references \
         "delete from xowiki_references where page = :item_id"
@@ -2555,7 +2555,7 @@
     if {![info exists ::xowiki_page_item_id_rendered]} {
       return ""
     }
-    #my log "--OMIT and not $field in ([join $::xowiki_page_item_id_rendered ,])"
+    #:log "--OMIT and not $field in ([join $::xowiki_page_item_id_rendered ,])"
     return "and not $field in ([join $::xowiki_page_item_id_rendered ,])"
   }
 
@@ -2669,7 +2669,7 @@
     #
     # record references and clear it
     #
-    #my msg "we have the content, update=$update_references, unresolved=[:references get unresolved]"
+    #:msg "we have the content, update=$update_references, unresolved=[:references get unresolved]"
     if {$update_references || [llength [:references get unresolved]] > 0} {
       :references_update [lsort -unique [:references get resolved]]
     }
@@ -2717,7 +2717,7 @@
     foreach tag [::xowiki::Page get_tags -package_id ${:package_id} -item_id ${:item_id}] {
       set word($tag) 1
     }
-    #my log [list html $html keywords [array names word]]
+    #:log [list html $html keywords [array names word]]
     return [list mime text/html html $html keywords [array names word] text ""]
   }
 
@@ -2949,7 +2949,7 @@
     -name:required
   } {
     set key ::_form_field_names($name)
-    #my msg "FOUND($name)=[info exists $key]"
+    #:msg "FOUND($name)=[info exists $key]"
     if {[info exists $key]} {
       return [set $key]
     }
@@ -2974,9 +2974,9 @@
     set status [dict get $request status]
     set data [expr {[dict exists $request page] ? [dict get $request page] : ""}]
 
-    #my msg status=[$r set status]
+    #:msg status=[$r set status]
     if {$status == 200} {
-      #my msg data=$data
+      #:msg data=$data
       dom parse -simple -html $data doc
       $doc documentElement root
       set n [$root selectNodes {//*[@id="result_box"]}]
@@ -3044,7 +3044,7 @@
       set name "[::xowiki::autoname new -parent_id $source_item_id -name [:name]]"
       $package_id get_lang_and_name -name $name lang name
       $f set name $name
-      #my msg nls=[$f nls_language],source-nls=[$source nls_language]
+      #:msg nls=[$f nls_language],source-nls=[$source nls_language]
     }
     foreach {att value} $default_variables {
       $f set $att $value
@@ -3195,7 +3195,7 @@
       set src [$n getAttribute src]
       if {[regexp {^[^/]} $src]} {
         $n setAttribute src $prefix/$src
-        #my msg "setting src to $prefix/$src"
+        #:msg "setting src to $prefix/$src"
       }
     }
 
@@ -3259,7 +3259,7 @@
       return [:html_content]
     }
 
-    #my log "--F page_link=$page_link ---- "
+    #:log "--F page_link=$page_link ---- "
     set t [TableWidget new -volatile \
                -columns {
                  AnchorField name -label [_ xowiki.Page-name]
@@ -3423,11 +3423,11 @@
   PageInstance instproc get_short_spec {name} {
     #set form_constraints [:get_from_template form_constraints]
     set form_constraints [:get_form_constraints]
-    #my msg "fc of [self] [:name] = $form_constraints"
+    #:msg "fc of [self] [:name] = $form_constraints"
     if {$form_constraints ne ""} {
       set s [::xowiki::PageInstance get_short_spec_from_form_constraints \
                  -name $name -form_constraints $form_constraints]
-      #my msg "get_short_spec $name c=$form_constraints => '$s'"
+      #:msg "get_short_spec $name c=$form_constraints => '$s'"
       return $s
     }
     return ""
@@ -3460,7 +3460,7 @@
   }
 
   PageInstance instproc get_field_type {name default_spec} {
-    #my log "--w"
+    #:log "--w"
     # get widget spec from folder (highest priority)
     set spec [:widget_spec_from_folder_object $name [${:page_template} set name]]
     if {$spec ne ""} {
@@ -3506,11 +3506,11 @@
 
   FormPage instproc get_form_constraints {{-trylocal false}} {
     # We define it as a method to ease overloading.
-    #my msg "is_form=[:is_form]"
+    #:msg "is_form=[:is_form]"
     if {$trylocal && [:is_form]} {
       return [:property form_constraints]
     } else {
-      #my msg "get_form_constraints returns '[:get_from_template form_constraints]'"
+      #:msg "get_form_constraints returns '[:get_from_template form_constraints]'"
       return [:get_from_template form_constraints]
     }
   }
@@ -3522,28 +3522,28 @@
     @return either the property value or a default value
   } {
     set form_obj [:get_template_object]
-    #my msg "get $var from template form_obj=$form_obj [$form_obj info class]"
+    #:msg "get $var from template form_obj=$form_obj [$form_obj info class]"
 
     # The resulting page should be either a Form (PageTemplate) or
     # a FormPage (PageInstance)
     #
-    #my msg "parent of self [:name] is [$form_obj name] type [$form_obj info class]"
+    #:msg "parent of self [:name] is [$form_obj name] type [$form_obj info class]"
     #
     # If it is as well a PageInstance, we find the information in the
     # properties of this page. Note, that we cannot distinguish here between
     # intrinsic (starting with _) and extension variables, since get_from
     # template does not know about the logic with "_" (just "property" does).
     #
     if {[$form_obj istype ::xowiki::PageInstance]} {
-      #my msg "returning property $var from parent formpage $form_obj => '[$form_obj property $var $default]'"
+      #:msg "returning property $var from parent formpage $form_obj => '[$form_obj property $var $default]'"
       return [$form_obj property $var $default]
     }
 
     #
     # .... otherwise, it should be an instance variable ....
     #
     if {[$form_obj exists $var]} {
-      #my msg "returning parent instvar [$form_obj set $var]"
+      #:msg "returning parent instvar [$form_obj set $var]"
       return [$form_obj set $var]
     }
     #
@@ -3554,15 +3554,15 @@
     # which might not contain it, if e.g. the first form is a plain
     # wiki page.
     #
-    #my msg "resolve local property $var=>[:exists_property $var]"
+    #:msg "resolve local property $var=>[:exists_property $var]"
     if {[:istype ::xowiki::FormPage] && [:exists_property $var]} {
-      #my msg "returning local property [:property $var]"
+      #:msg "returning local property [:property $var]"
       return [:property $var]
     }
     #
     # if everything fails, return the default.
     #
-    #my msg "returning the default <$default>, parent is of type [$form_obj info class]"
+    #:msg "returning the default <$default>, parent is of type [$form_obj info class]"
     return $default
   }
 
@@ -3585,7 +3585,7 @@
     set __ia [dict merge [:template_vars $content] ${:instance_attributes}]
 
     foreach var [dict keys $__ia] {
-      #my log "-- set $var [list $__ia($var)]"
+      #:log "-- set $var [list $__ia($var)]"
       # TODO: just for the lookup, whether a field is a richt text field,
       # there should be a more efficient and easier way...
       if {[string match "richtext*" [:get_field_type $var text]]} {
@@ -3616,7 +3616,7 @@
   Object instproc render_content {} {
     if {[[self]::payload info methods content] ne ""} {
       set html [[self]::payload content]
-      #my msg render-adp=[:render_adp]
+      #:msg render-adp=[:render_adp]
       if {[:render_adp]} {
         set html [:adp_subst $html]
         return [:substitute_markup $html]
@@ -3713,7 +3713,7 @@
     ::xowiki::Form requireFormCSS
 
     # we assume, that the richtext is stored as 2-elem list with mime-type
-    #my log "-- text='${:text}'"
+    #:log "-- text='${:text}'"
     if {[lindex ${:text} 0] ne ""} {
       :do_substitutions 0
       set html ""; set mime ""
@@ -3745,7 +3745,7 @@
       regexp {^([^:]+):(.*)$} $name_and_spec _ spec_name short_spec
       if {[string match "@table*" $spec_name] || $spec_name eq "@categories"} continue
 
-      #my msg "checking spec '$short_spec' for form field '$spec_name'"
+      #:msg "checking spec '$short_spec' for form field '$spec_name'"
       lappend form_fields [:create_raw_form_field \
                                -name $spec_name \
                                -slot [:find_slot $spec_name] \
@@ -3792,7 +3792,7 @@
   # Methods of ::xowiki::FormPage
   #
   FormPage instproc initialize_loaded_object {} {
-    #my msg "[:name] [:info class]"
+    #:msg "[:name] [:info class]"
     if {[info exists :page_template]} {
       set p [::xo::db::CrClass get_instance_from_db -item_id [:page_template]]
       #
@@ -3817,7 +3817,7 @@
   FormPage instproc condition=in_state {query_context value} {
     # possible values can be or-ed together (e.g. initial|final)
     foreach v [split $value |] {
-      #my msg "check [:state] eq $v"
+      #:msg "check [:state] eq $v"
       if {[:state] eq $v} {return 1}
     }
     return 0
@@ -3831,7 +3831,7 @@
     array set tcl_op {= eq < < > > >= >= <= <=}
     array set sql_op {= =  < < > > >= >= <= <=}
     array set op_map {contains,sql {$lhs_var like '%$rhs%'} contains,tcl {{$rhs} in $lhs_var}}
-    #my msg unless=$unless
+    #:msg unless=$unless
     #example for unless: wf_current_state = closed|accepted || x = 1
     set tcl_clause [list]
     set h_clause [list]
@@ -3847,7 +3847,7 @@
           #
           set lhs_var [string range $lhs 1 end]
           set rhs [split $rhs_expr |]
-          #my msg "check op '$op' in sql [info exists op_map($op,sql)]"
+          #:msg "check op '$op' in sql [info exists op_map($op,sql)]"
           if {[info exists op_map($op,sql)]} {
             lappend sql_clause [subst -nocommands $op_map($op,sql)]
             if {[info exists :$lhs_var]} {
@@ -3897,10 +3897,10 @@
       }
     }
     if {[llength $tcl_clause] == 0} {set tcl_clause [list true]}
-    #my msg sql=$sql_clause,tcl=$tcl_clause
+    #:msg sql=$sql_clause,tcl=$tcl_clause
     return [list tcl [join $tcl_clause $logical_op] h [join $h_clause ,] \
                 vars $vars sql $sql_clause]
-    #my msg $expression
+    #:msg $expression
   }
 
   FormPage proc get_form_entries {
@@ -3979,7 +3979,7 @@
       }
       lappend sql_atts [$f set __base_field]
     }
-    #my msg sql_atts=$sql_atts
+    #:msg sql_atts=$sql_atts
 
     #
     # Build parts of WHERE clause
@@ -3997,13 +3997,13 @@
     if {$use_hstore && $wc(h) ne ""} {
       set filter_clause " and '$wc(h)' <@ hkey"
     }
-    #my msg "exists sql=[info exists wc(sql)]"
+    #:msg "exists sql=[info exists wc(sql)]"
     if {$wc(sql) ne "" && $wc(h) ne ""} {
       foreach filter $wc(sql) {
         append filter_clause "and $filter"
       }
     }
-    #my msg filter_clause=$filter_clause
+    #:msg filter_clause=$filter_clause
 
     #
     # Build package clause
@@ -4152,7 +4152,7 @@
 
     set list_of_folders [list $folder_id]
     set inherit_folders [FormPage get_super_folders $package_id $folder_id]
-    #my log inherit_folders=$inherit_folders
+    #:log inherit_folders=$inherit_folders
 
     foreach item_ref $inherit_folders {
       set folder [::xo::cc cache [list $package_id get_page_from_item_ref $item_ref]]
@@ -4312,11 +4312,11 @@
     lassign $value property_name op property_value
     if {![info exists property_value]} {return 0}
 
-    #my log "$value => [:adp_subst $value]"
+    #:log "$value => [:adp_subst $value]"
     array set wc [::xowiki::FormPage filter_expression [:adp_subst $value] &&]
-    #my log "wc= [array get wc]"
+    #:log "wc= [array get wc]"
     set __ia [dict merge $wc(vars) [:instance_attributes]]
-    #my log "expr $wc(tcl) returns => [expr $wc(tcl)]"
+    #:log "expr $wc(tcl) returns => [expr $wc(tcl)]"
     return [expr $wc(tcl)]
   }
 
@@ -4359,7 +4359,7 @@
                      {*}[::xo::db::CrClass set common_query_atts]]
 
     set template [:get_html_from_content [:get_from_template text]]
-    #my msg template=$template
+    #:msg template=$template
 
     #set field_names [list _name _title _description _creator _nls_language _page_order]
     set field_names [list]
@@ -4477,11 +4477,11 @@
       catch {set text [lindex $text 0]}
     }
     if {$text ne ""} {
-      #my log "we have a template text='$text'"
+      #:log "we have a template text='$text'"
       # we have a template
       return [next]
     } else {
-      #my log "we have a form '[:get_form]'"
+      #:log "we have a form '[:get_form]'"
       set form [:get_form]
       if {$form eq ""} {return ""}
 
@@ -4598,14 +4598,14 @@
     set old_members [group::get_members -group_id $group_id]
     foreach m $members {
       if {$m ni $old_members} {
-        #my msg "we have to add $m"
+        #:msg "we have to add $m"
         group::add_member -group_id $group_id -user_id $m \
             -rel_type $rel_type -member_state $member_state
       }
     }
     foreach m $old_members {
       if {$m ni $members} {
-        #my msg "we have to remove $m"
+        #:msg "we have to remove $m"
         group::remove_member -group_id $group_id -user_id $m
       }
     }
@@ -4625,7 +4625,7 @@
 
   Page instproc map_categories {category_ids} {
     # could be optimized, if we do not want to have categories (form constraints?)
-    #my log "--category::map_object -remove_old -object_id ${:item_id} <$category_ids>"
+    #:log "--category::map_object -remove_old -object_id ${:item_id} <$category_ids>"
     category::map_object -remove_old -object_id ${:item_id} $category_ids
   }
 
@@ -4644,7 +4644,7 @@
   # procs.
   #
   Page instproc save_data {{-use_given_publish_date:boolean false} old_name category_ids} {
-    #my log "-- [self args]"
+    #:log "-- [self args]"
     :unset_temporary_instance_variables
     set package_id ${:package_id}
 
Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -N -r1.44 -r1.45
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	1 Feb 2018 22:16:44 -0000	1.44
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	9 Apr 2018 07:58:06 -0000	1.45
@@ -45,9 +45,9 @@
         ::xowiki::write_file $in_file $text
         catch {exec $tidycmd -q -w 0 -ashtml < $in_file 2> /dev/null} output
         file delete -- $in_file
-        #my msg o=$output
+        #:msg o=$output
         regexp <body>\n(.*)\n</body> $output _ text
-        #my msg o=$text
+        #:msg o=$text
         return $text
       }
     }
@@ -676,7 +676,7 @@
             [::xowiki::Includelet publish_status_clause $publish_status] \
             and ci.parent_id = $parent_id \
             and ([join $likes { or }])"
-    #my log $sql
+    #:log $sql
     set pages [::xo::dc list_of_lists get_pages_with_page_order $sql]
     return $pages
   }
@@ -689,9 +689,9 @@
      -to
    } {
     set pages [:get_page_order_items -parent_id $parent_id -publish_status $publish_status $to]
-    #my log "pages=$pages"
+    #:log "pages=$pages"
     array set npo [::xowiki::utility page_order_compute_new_names $start $to]
-    #my log npo=[array get npo]=>to='$to'
+    #:log npo=[array get npo]=>to='$to'
     set renames [list]
     foreach tuple $pages {
       lassign $tuple old_page_order page_id item_id name
@@ -701,17 +701,17 @@
         #
         if {$npo($old_page_order) eq $old_page_order} {
           # Nothing to do
-          #my log "--cpo name $old_page_order not changed"
+          #:log "--cpo name $old_page_order not changed"
         } else {
-          #my log "--cpo name $old_page_order changed to '$npo($old_page_order)'"
+          #:log "--cpo name $old_page_order changed to '$npo($old_page_order)'"
           lappend renames $page_id $item_id $name $old_page_order $npo($old_page_order)
         }
       } else {
         # 
         # We have no translation in the list. This must be an item
         # from a subtree of changed page_orders.
         #
-        #my log "--cpo no translation for $old_page_order, check prefix"
+        #:log "--cpo no translation for $old_page_order, check prefix"
         foreach new_name [array names npo] {
           if {[string match $new_name.* $old_page_order]} {
             #