Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.127 -r1.128
--- openacs-4/packages/xowiki/xowiki.info 31 May 2010 10:03:40 -0000 1.127
+++ openacs-4/packages/xowiki/xowiki.info 9 Jun 2010 12:53:28 -0000 1.128
@@ -10,11 +10,11 @@
t
xowiki
-
+
Gustaf Neumann
A more generic xotcl-based wikis example with object types
and subtypes based on the content repository (with category support)
- 2010-05-31
+ 2010-06-09
Gustaf Neumann, WU Wien
<pre>
XoWiki is a Wiki implementation for OpenACS in XOTcl. Instead of
@@ -56,55 +56,30 @@
BSD-Style
0
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
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.59 -r1.60
--- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 2 May 2010 12:50:19 -0000 1.59
+++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 9 Jun 2010 12:53:28 -0000 1.60
@@ -514,5 +514,32 @@
delete_parameter top_portlet
}
+ set v 0.127
+ if {[apm_version_names_compare $from_version_name $v] == -1 &&
+ [apm_version_names_compare $to_version_name $v] > -1} {
+ ns_log notice "-- upgrading to $v"
+
+ ::xowiki::Package initialize -package_id [::xowiki::Package first_instance]
+ ::xowiki::Package require_site_wide_pages
+ foreach p [::xowiki::Package instances] {::xowiki::transform_root_folder $p}
+ foreach p [::xowf::Package instances] {::xowiki::transform_root_folder $p}
+
+ foreach package_id [::xowiki::Package instances] {
+ ::xowiki::Package initialize -package_id $package_id
+ set item_id [$package_id lookup -name ::[$package_id folder_id]]
+ if {$item_id ne 0} {
+ ::xowiki::Object get_instance_from_db -item_id $item_id
+ set p [$item_id get_payload widget_specs]
+ if {$p ne ""} {
+ ns_log notice "Transfering widget_specs to parameter WidgetSpecs for $package_id [$package_id package_url]"
+ parameter::set_value -package_id $package_id -parameter WidgetSpecs -value $p
+ }
+ } else {
+ ns_log notice "no folder object found for $package_id - [$package_id package_url]"
+ }
+ }
+ }
+
+
}
}
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 -r1.12 -r1.13
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl 31 May 2010 13:13:07 -0000 1.12
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl 9 Jun 2010 12:53:28 -0000 1.13
@@ -244,7 +244,7 @@
set f [FormPage get_instance_from_db -item_id $item_id]
if {[$f page_template] != $form_id} {
ns_log notice "... must change form_id from [$f page_template] to $form_id"
- db_dml chg0 "update xowiki_page_instance set page_template = $form_id where revision_id = [$f revision_id]"
+ db_dml chg0 "update xowiki_page_instance set page_template = $form_id where page_instance_id = [$f revision_id]"
}
return
}