Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.180.2.69 -r1.180.2.70 --- openacs-4/packages/xowiki/xowiki.info 16 Sep 2021 08:27:38 -0000 1.180.2.69 +++ openacs-4/packages/xowiki/xowiki.info 16 Sep 2021 09:49:46 -0000 1.180.2.70 @@ -10,7 +10,7 @@ t xowiki - + Gustaf Neumann A xotcl-based enterprise wiki system with multiple object types 2021-09-15 @@ -55,8 +55,8 @@ BSD-Style 2 - - + + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/resources/prototypes/weblog-portlet.page'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/resources/prototypes/weblog.page'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl,v diff -u -r1.15.2.13 -r1.15.2.14 --- openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl 14 Mar 2021 16:34:44 -0000 1.15.2.13 +++ openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl 16 Sep 2021 09:49:47 -0000 1.15.2.14 @@ -867,6 +867,40 @@ } } + set v 5.10.1d1 + 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" + + # + # Update the prototype page for en:weblog-portlet. We do not + # follow here the approach of earlier releases to instantiate + # all xowiki packages (that might be many) and call + # www-import-prototype-page, but we check for unmodified + # prototype pages and delete just these (since they will be + # regenerated on the fly when needed). + # + set page en:weblog-portlet + set item_ids [::xo::dc list get_unmodified_prototype_pages { + select ci.item_id + from cr_items ci,cr_revisions cr + where name = :page and live_revision = cr.revision_id + group by 1 having count(cr.revision_id) = 1 + }] + foreach item_id $item_ids { + ns_log notice "Delete unmodified prototype pages for $page: $item_id" + ::xo::db::sql::content_item delete -item_id $item_id + } + set item_ids [::xo::dc list get_modified_prototype_pages { + select ci.item_id + from cr_items ci,cr_revisions cr + where name = :page and live_revision = cr.revision_id + group by 1 having count(cr.revision_id) > 1 + }] + if {[llength $item_ids] > 0} { + ns_log notice "Modified prototype pages for $page: $item_ids (require manual checking)" + } + } } } Fisheye: Tag 1.25.4.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.9.6.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/prototypes/weblog.page'. Fisheye: No comparison available. Pass `N' to diff?