Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.65 -r1.66 --- openacs-4/packages/xowiki/xowiki.info 18 Sep 2007 13:28:32 -0000 1.65 +++ openacs-4/packages/xowiki/xowiki.info 20 Sep 2007 12:19:37 -0000 1.66 @@ -8,12 +8,12 @@ f xowiki - - Gustaf Neumann, WU Wien + + Gustaf Neumann A more generic xotcl-based wikis example with object types and subtypes based on the content repository (with category support) - 2007-09-14 - Gustaf Neumann + 2007-09-20 + Gustaf Neumann, WU Wien <pre> XoWiki is a Wiki implementation for OpenACS in XOTcl. Instead of trying to implement the full set of Wiki markup commands of systems @@ -54,16 +54,16 @@ BSD-Style 0 - + - + - + 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.88 -r1.89 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 12 Sep 2007 18:56:10 -0000 1.88 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 20 Sep 2007 12:19:37 -0000 1.89 @@ -863,13 +863,13 @@ my instvar folder_id id if {$name eq "::$folder_id"} { #my log "--D deleting folder object ::$folder_id" - ns_cache flush xotcl_object_cache ::$folder_id - ns_cache flush xotcl_object_type_cache item_id-of-$folder_id - ns_cache flush xotcl_object_type_cache root_folder-$id + ::xo::clusterwide ns_cache flush xotcl_object_cache ::$folder_id + ::xo::clusterwide ns_cache flush xotcl_object_type_cache item_id-of-$folder_id + ::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] {ns_cache flush xowiki_cache $n} + foreach n [ns_cache names xowiki_cache $key] {::xo::clusterwide ns_cache flush xowiki_cache $n} } Package instproc delete {-item_id -name} { 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 -r1.88 -r1.89 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 3 Sep 2007 21:07:53 -0000 1.88 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 20 Sep 2007 12:19:37 -0000 1.89 @@ -287,7 +287,7 @@ foreach entry [ns_cache names xowiki_cache link-*-$folder_id] { array set tmp [ns_cache get xowiki_cache $entry] if {$tmp(item_id) == [$data set item_id]} { - ns_cache flush xowiki_cache $entry + ::xo::clusterwide ns_cache flush xowiki_cache $entry } } if {![$data istype ::xowiki::Object] && Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.101 -r1.102 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 13 Sep 2007 20:48:20 -0000 1.101 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 20 Sep 2007 12:19:37 -0000 1.102 @@ -247,8 +247,8 @@ # if we edit the folder object, we have to do some extra magic here, # since the folder object has slightly different naming conventions. # ns_log notice "--editing folder object ::$folder_id, FLUSH $page" - ns_cache flush xotcl_object_cache [self] - ns_cache flush xotcl_object_cache ::$folder_id + ::xo::clusterwide ns_cache flush xotcl_object_cache [self] + ::xo::clusterwide ns_cache flush xotcl_object_cache ::$folder_id my move ::$folder_id set page ::$folder_id #ns_log notice "--move page=$page" @@ -854,7 +854,7 @@ #my log "--M set_live_revision($revision_id)" ::xo::db::sql::content_item set_live_revision -revision_id $revision_id set page_id [my query_parameter "page_id"] - ns_cache flush xotcl_object_cache ::$item_id + ::xo::clusterwide ns_cache flush xotcl_object_cache ::$item_id ::$package_id returnredirect [my query_parameter "return_url" \ [export_vars -base [$package_id url] {{m revisions}}]] } @@ -863,8 +863,8 @@ Page instproc delete-revision {} { my instvar revision_id package_id item_id db_1row [my qn get_revision] "select latest_revision,live_revision from cr_items where item_id = $item_id" - ns_cache flush xotcl_object_cache ::$item_id - ns_cache flush xotcl_object_cache ::$revision_id + ::xo::clusterwide ns_cache flush xotcl_object_cache ::$item_id + ::xo::clusterwide ns_cache flush xotcl_object_cache ::$revision_id ::xo::db::sql::content_revision del -revision_id $revision_id set redirect [my query_parameter "return_url" \ [export_vars -base [$package_id url] {{m revisions}}]] Index: openacs-4/packages/xowiki/www/ajax/chat.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ajax/Attic/chat.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/xowiki/www/ajax/chat.tcl 9 Apr 2006 00:07:10 -0000 1.4 +++ openacs-4/packages/xowiki/www/ajax/chat.tcl 20 Sep 2007 12:19:37 -0000 1.5 @@ -12,7 +12,7 @@ {mode ""} } -#ns_log notice "--c m=$m session_id=$s [clock format [lindex [split $s .] 1] -format %H:%M:%S] mode=$mode" +#ns_log notice "--chat m=$m session_id=$s [clock format [lindex [split $s .] 1] -format %H:%M:%S] mode=$mode" ::xowiki::Chat c1 -volatile -chat_id $id -session_id $s -mode $mode switch -- $m { add_msg { @@ -30,11 +30,11 @@ ns_return 200 text/html " $_
-" \ No newline at end of file +"