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.31.2.5 -r1.31.2.6 --- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl 13 Mar 2014 12:28:44 -0000 1.31.2.5 +++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl 13 Mar 2014 12:33:09 -0000 1.31.2.6 @@ -473,7 +473,7 @@ return $pairs } - my proc get_page_order_items {-parent_id page_orders} { + my proc get_page_order_items {-parent_id {-publish_status "production"} page_orders} { set likes [list] foreach page_order $page_orders { if {[::xowiki::page_order_uses_ltree]} { @@ -486,16 +486,22 @@ from xowiki_page p, cr_items ci, cr_revisions cr \ where p.page_id = ci.live_revision \ and p.page_id = cr.revision_id \ - and ci.publish_status <> 'production' \ + [::xowiki::Includelet publish_status_clause $publish_status] \ and ci.parent_id = $parent_id \ and ([join $likes { or }])" #my log $sql set pages [::xo::dc list_of_lists get_pages_with_page_order $sql] return $pages } - ::xowiki::utility proc page_order_renames {-parent_id -start -from -to} { - set pages [my get_page_order_items -parent_id $parent_id $to] + ::xowiki::utility proc page_order_renames { + -parent_id + {-publish_status "production"} + -start + -from + -to + } { + set pages [my get_page_order_items -parent_id $parent_id -publish_status $publish_status $to] #my log "pages=$pages" array set npo [::xowiki::utility page_order_compute_new_names $start $to] #my log npo=[array get npo]=>to='$to'