Index: openacs-4/packages/xotcl-core/xotcl-core.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/xotcl-core.info,v
diff -u -N -r1.77 -r1.78
--- openacs-4/packages/xotcl-core/xotcl-core.info	9 Jun 2010 12:52:06 -0000	1.77
+++ openacs-4/packages/xotcl-core/xotcl-core.info	18 Jun 2010 10:26:59 -0000	1.78
@@ -10,10 +10,10 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xotcl</auto-mount>
 
-    <version name="0.114" url="http://media.wu-wien.ac.at/download/xotcl-core-0.114.apm">
+    <version name="0.115" url="http://media.wu-wien.ac.at/download/xotcl-core-0.115.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XOTcl library functionality (e.g. thread handling, online documentation, Generic Form and List Classes)</summary>
-        <release-date>2010-06-09</release-date>
+        <release-date>2010-06-18</release-date>
         <vendor>Gustaf Neumann, WU Wien</vendor>
         <description format="text/html">This component contains some core functionality for OpenACS
 applications using XOTcl. It includes
@@ -43,11 +43,11 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xotcl-core" version="0.114"/>
+        <provides url="xotcl-core" version="0.115"/>
 
         <callbacks>
-            <callback type="after-upgrade"  proc="::xotcl-core::after_upgrade_callback"/>
             <callback type="before-install"  proc="::xotcl-core::before_install_callback"/>
+            <callback type="after-upgrade"  proc="::xotcl-core::after_upgrade_callback"/>
         </callbacks>
         <parameters>
             <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="NslogRedirector"  default="0" description="Allow redirections of nslog. The redirector filters ns_log messages and sends these not only to the error log (standard behaviour) but also to ds_comments in the developer support. This way, a developer can view the log messages for the current request directly in the browser when the developer support is activated, without having to watch the log file. 
Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v
diff -u -N -r1.53 -r1.54
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl	1 Jun 2010 08:43:20 -0000	1.53
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl	18 Jun 2010 10:26:59 -0000	1.54
@@ -508,8 +508,10 @@
   
   proc ::xo::update_query_variable {old_query var value} {
     #
-    # replace in a url-query old occurances of var with new value.
+    # Replace in a url-query old occurances of var with new value.
     #
+    # @return pairs in a form suitable for export_vars
+    #
     set query [list [list $var $value]]
     foreach pair [split $old_query &] {
       foreach {key value} [split $pair =] break
@@ -519,4 +521,19 @@
     return $query
   }
 
+  proc ::xo::update_query {old_query var value} {
+    #
+    # Replace in a url-query old occurances of var with new value.
+    #
+    # @return encoded HTTP query
+    #
+    set query [ns_urlencode $var]=[ns_urlencode $value]
+    foreach pair [split $old_query &] {
+      foreach {key value} [split $pair =] break
+      if {$key eq $var} continue
+      append query &$pair
+    }
+    return $query
+  }
+
 }
\ No newline at end of file
Index: openacs-4/packages/xotcl-core/tcl/policy-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/policy-procs.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/xotcl-core/tcl/policy-procs.tcl	31 May 2010 13:05:07 -0000	1.20
+++ openacs-4/packages/xotcl-core/tcl/policy-procs.tcl	18 Jun 2010 10:26:59 -0000	1.21
@@ -152,7 +152,7 @@
 	complex {
 	  foreach {attribute privilege} $p break
 	  set id [$object set $attribute]
-	  #my msg "--p checking permission -object_id $id -privilege $privilege -party_id $user_id\
+	  #my msg "--p checking permission -object_id /$id/ -privilege $privilege -party_id $user_id\
 	  #	==> [::xo::cc permission -object_id $id -privilege $privilege -party_id $user_id]"
 	  return [::xo::cc permission -object_id $id -privilege $privilege -party_id $user_id]
 	}