" + append msg "$added objects newly inserted, $updated objects updated, $replaced objects replaced
"
}
#
@@ -649,6 +649,7 @@
Package ad_instproc rss {
-maxentries
-name_filter
+ -entries_of
-title
-days
} {
@@ -666,7 +667,9 @@
if {![info exists namefilter]} {
set name_filter [my get_parameter name_filter ""]
}
-
+ if {![info exists entries_of]} {
+ set entries_of [my get_parameter entries_of ""]
+ }
if {![info exists title]} {
set title [my get_parameter title ""]
if {$title eq ""} {
@@ -684,6 +687,7 @@
set r [RSS new -destroy_on_cleanup \
-package_id [my id] \
-name_filter $name_filter \
+ -entries_of $entries_of \
-title $title \
-days $days]
Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl 24 Jul 2007 13:21:39 -0000 1.15
+++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl 25 Jul 2007 23:59:24 -0000 1.16
@@ -22,6 +22,7 @@
Class RSS -superclass XMLSyndication -parameter {
maxentries
{name_filter ""}
+ {entries_of ""}
{days ""}
{css ""}
{siteurl "[ad_url]"}
@@ -97,34 +98,55 @@
}
RSS instproc extra_where_clause {} {
- my instvar name_filter days
+ my instvar name_filter days entries_of package_id
set extra_where_clause ""
if {$name_filter ne ""} {
append extra_where_clause " and ci.name ~ E'$name_filter' "
}
if {$days ne ""} {
append extra_where_clause " and p.last_modified > (now() + interval '$days days ago')"
}
+ if {$entries_of ne ""} {
+ set form_items [list]
+ set folder_id [$package_id folder_id]
+ foreach t [split $entries_of |] {
+ set form_item_id [::xowiki::Form lookup -name $t -parent_id $folder_id]
+ if {$form_item_id == 0} {error "Cannot lookup page $t"}
+ lappend form_items $form_item_id
+ }
+ append extra_where_clause " and p.page_template in ('[join $form_items ',']') and p.page_instance_id = p.revision_id "
+
+ my set base_table xowiki_form_pagex
+ }
return $extra_where_clause
}
RSS instproc render {} {
- my instvar package_id max_entries name_filter title days description siteurl
+ my instvar package_id max_entries name_filter title days description siteurl base_table
set folder_id [::$package_id folder_id]
if {$description eq ""} {set description [::$folder_id set description]}
my set link $siteurl[site_node::get_url_from_object_id -object_id $package_id]
- #my log "--rss WHERE= [my extra_where_clause]"
+ set base_table xowiki_pagex
+ set extra_where_clause [my extra_where_clause]
+ if {$base_table ne "xowiki_pagex"} {
+ # we assume, we retrieve the entries for a form
+ set extra_from ""
+ } else {
+ # return always instance_attributes
+ set extra_from "left join \
+ xowiki_page_instance on (p.revision_id = page_instance_id)"
+ }
+
set sql [::xo::db::sql select \
-vars "s.body, p.name, p.creator, p.title, p.page_id, instance_attributes, \
p.object_type as content_type, p.last_modified, p.description" \
- -from "syndication s, cr_items ci, xowiki_pagex p left join \
- xowiki_page_instance on (p.revision_id = page_instance_id)" \
+ -from "syndication s, cr_items ci, $base_table p $extra_from" \
-where "ci.parent_id = $folder_id and ci.live_revision = s.object_id \
and ci.publish_status <> 'production' \
- [my extra_where_clause] \
+ $extra_where_clause \
and s.object_id = p.page_id" \
-orderby "p.last_modified desc" \
-limit [my limit]]
Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl 24 Jul 2007 13:58:10 -0000 1.16
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl 25 Jul 2007 23:59:24 -0000 1.17
@@ -11,7 +11,7 @@
tag
ptag
category_id
- {instances_of ""}
+ {entries_of ""}
filter_msg
{sort_composite ""}
{no_footer false}
@@ -20,12 +20,13 @@
{exclude_item_ids 0}
{summary false}
{entry_renderer ::xowiki::Weblog::Entry}
+ {entry_flag}
}
::xowiki::Weblog instproc init {} {
my instvar filter_msg package_id nr_items next_page_link prev_page_link
my instvar date category_id tag ptag page_number page_size summary items
- my instvar name_filter entry_label instances_of sort_composite
+ my instvar name_filter entry_label entries_of sort_composite
my log "--W starting"
set folder_id [::$package_id set folder_id]
@@ -76,10 +77,10 @@
set base_type ::xowiki::Page
set base_table xowiki_pagei
set attributes [list cr.revision_id p.publish_date p.title p.creator p.creation_user \
- p.description s.body instance_attributes]
- if {$instances_of ne ""} {
+ p.description s.body pi.instance_attributes]
+ if {$entries_of ne ""} {
set form_items [list]
- foreach t [split $instances_of |] {
+ foreach t [split $entries_of |] {
set form_item_id [::xowiki::Form lookup -name $t -parent_id $folder_id]
if {$form_item_id == 0} {error "Cannot lookup page $t"}
lappend form_items $form_item_id
@@ -105,7 +106,7 @@
-orderby "publish_date desc" \
-from_clause "$extra_from_clause, $base_table p \
left outer join syndication s on s.object_id = p.revision_id \
- left join xowiki_page_instance on (p.revision_id = page_instance_id)" \
+ left join xowiki_page_instance pi on (p.revision_id = pi.page_instance_id)" \
-where_clause "ci.item_id not in ([my exclude_item_ids]) \
and ci.name != '::$folder_id' and ci.name not like '%weblog%' $date_clause \
[::xowiki::Page container_already_rendered ci.item_id] \
@@ -119,7 +120,8 @@
}
set nr_items [db_string count [eval $base_type instance_select_query $sql -count true]]
-
+ #my msg count=$nr_items
+ #my msg sql=$sql
set s [$base_type instantiate_objects -sql [eval $base_type instance_select_query $sql]]
foreach c [$s children] {
@@ -145,10 +147,12 @@
set p [::Generic::CrItem instantiate -item_id 0 -revision_id $revision_id]
# in cases, the revision was created already earlier, drop the mixins
if {[$p info mixin] ne ""} {$p mixin {}}
+ if {[my exists entry_flag]} {$p set [my entry_flag] 1}
if {[my no_footer]} {$p set __no_footer 1}
if {[catch {$p set description [$p render]} errorMsg]} {
set description "Render Error ($errorMsg) $revision_id $name $title"
}
+ if {[my exists entry_flag]} {$p unset [my entry_flag]}
#my log "--W $p render (mixins=[$p info mixin]) => $description"
}
$p set pretty_date $pretty_date
@@ -199,7 +203,7 @@
}
::xowiki::Weblog instproc render {} {
- my log "--W begin"
+ #my log "--W begin"
my instvar items
#
# We need the following CSS file for rendering
@@ -209,7 +213,7 @@
$items set entry_renderer [my entry_renderer]
set content [$items render]
$items destroy_on_cleanup
- my log "--W end"
+ #my log "--W end"
return $content
}
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 -N -r1.81 -r1.82
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 24 Jul 2007 20:48:33 -0000 1.81
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 25 Jul 2007 23:59:24 -0000 1.82
@@ -675,8 +675,8 @@
-parameter {
{field_list {item_id name page_order title creator text form form_constraints
anon_instances description nls_language}}
- {f.text "= richtext,height=200px"}
- {f.form "= richtext,height=200px"}
+ {f.text "= richtext,height=150px,label=#xowiki.Form-template#"}
+ {f.form "= richtext,height=150px"}
{f.form_constraints "="}
{validate {
{name {\[::xowiki::validate_name\]} {Another item with this name exists \
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -N -r1.77 -r1.78
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 25 Jul 2007 10:54:47 -0000 1.77
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 25 Jul 2007 23:59:24 -0000 1.78
@@ -273,13 +273,14 @@
{parameter_declaration {
{-span "10d"}
{-name_filter}
+ {-entries_of}
{-title}
}}
}
rss-button instproc render {} {
my get_parameters
- set href [export_vars -base [$package_id package_url] {{rss $span} name_filter title}]
+ set href [export_vars -base [$package_id package_url] {{rss $span} name_filter title entries_of}]
return "RSS"
}
@@ -1637,19 +1638,26 @@
item-button instproc render_button {
-page
+ -package_id
-method
-src
-alt
-title
-return_url
-page_order
+ -object_type
} {
set html ""
- set package_id [$page package_id]
- set p_link [$package_id pretty_link [$page name]]
if {![info exists return_url]} {set return_url $p_link}
if {![info exists alt]} {set alt $method}
- set edit_link [$package_id make_link -link $p_link $page $method return_url page_order]
+ if {[$page istype ::xowiki::Package]} {
+ set edit_link [$package_id make_link $package_id \
+ edit-new page_order object_type return_url autoname]
+ } else {
+ set p_link [$package_id pretty_link [$page name]]
+ set edit_link [$package_id make_link -link $p_link $page $method return_url page_order]
+ }
+
if {$edit_link ne ""} {
set html "