Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.78 -r1.79
--- openacs-4/packages/xowiki/xowiki.info	5 Apr 2008 11:13:25 -0000	1.78
+++ openacs-4/packages/xowiki/xowiki.info	10 Apr 2008 07:52:57 -0000	1.79
@@ -8,11 +8,11 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.84" url="http://openacs.org/repository/download/apm/xowiki-0.84.apm">
+    <version name="0.85" url="http://openacs.org/repository/download/apm/xowiki-0.85.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
-        <release-date>2008-04-05</release-date>
+        <release-date>2008-04-10</release-date>
         <vendor>Gustaf Neumann, WU Wien</vendor>
         <description format="text/html">&lt;pre&gt;
 XoWiki is a Wiki implementation for OpenACS in XOTcl. Instead of
@@ -54,16 +54,16 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.84"/>
+        <provides url="xowiki" version="0.85"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
         <requires url="general-comments" version="4.6.1"/>
-        <requires url="xotcl-core" version="0.84"/>
+        <requires url="xotcl-core" version="0.85"/>
 
         <callbacks>
-            <callback type="after-install"  proc="::xowiki::after-install"/>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
+            <callback type="after-install"  proc="::xowiki::after-install"/>
             <callback type="after-upgrade"  proc="::xowiki::upgrade_callback"/>
         </callbacks>
         <parameters>
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 -r1.114 -r1.115
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	25 Mar 2008 12:01:17 -0000	1.114
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	10 Apr 2008 07:52:57 -0000	1.115
@@ -879,10 +879,15 @@
       ::xo::clusterwide ns_cache flush xotcl_object_type_cache root_folder-$id
       ::$folder_id destroy
     }
-    set key link-*-$name-$folder_id
-    foreach n [ns_cache names xowiki_cache $key] {::xo::clusterwide ns_cache flush xowiki_cache $n}
+    my flush_name_cache -name $name -parent_id $folder_id
   }
 
+  Package instproc flush_name_cache {-name:required -parent_id:required} {
+    # Different machines in the cluster might have different entries in their caches.
+    # Since we use wild-cards to find these, it has to be done on every machine
+    ::xo::clusterwide xo::cache_flush_all xowiki_cache link-*-$name-$parent_id
+  }
+
   Package instproc delete {-item_id -name} {
     #
     # This delete method does not require an instanantiated object,
Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	14 Mar 2008 20:04:56 -0000	1.40
+++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	10 Apr 2008 07:52:57 -0000	1.41
@@ -347,7 +347,7 @@
       catch {
 	# for new installs, the old column might not exist, therefor the catch
 	db_dml drop_old_column \
-	    "alter table xowiki_page_instance drop column old_page_template"
+	    "alter table xowiki_page_instance drop column old_page_template cascade"
       }
       ::xowiki::update_views
     }
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 -r1.222 -r1.223
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 Apr 2008 10:57:48 -0000	1.222
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 Apr 2008 07:52:57 -0000	1.223
@@ -199,8 +199,8 @@
     clean   {[\\](\{\{|&gt;&gt;|\[\[)}
     clean2  { <br */?> *(<div)}
   }
-  Page set markupmap(escape)   [list "\\\[\[" \01   "\\\{\{" \02   {\\&lt;&lt;} \03]
-  Page set markupmap(unescape) [list \01 "\[\["     \02 "\{\{"     \03 {&lt;&lt;}  ]
+  Page set markupmap(escape)   [list "\\\[\[" \03\01 "\\\{\{" \03\02  {\\&lt;&lt;} \03\03]
+  Page set markupmap(unescape) [list \03\01 "\[\["    \03\02 "\{\{"   \03\03 {&lt;&lt;}  ]
 
   #
   # templating and CSS
@@ -1070,8 +1070,8 @@
     clean   {[\\](\{\{|>>|\[\[)}
     clean2  {(--DUMMY NOT USED--)}
   }
-  PlainPage set markupmap(escape)   [list "\\\[\[" \01  "\\\{\{" \02   {\<<} \03]
-  PlainPage set markupmap(unescape) [list \01 "\[\["    \02 "\{\{"     \03 {<<}]
+  PlainPage set markupmap(escape)   [list "\\\[\["  \03\01  "\\\{\{"  \03\02   {\<<}  \03\03]
+  PlainPage set markupmap(unescape) [list  \03\01 "\[\["     \03\02 "\{\{"      \03\03 {<<}]
 
 
   PlainPage instproc get_content {} {