Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql 14 Sep 2002 16:40:33 -0000 1.2 @@ -3,14 +3,6 @@ oracle8.1.6 - - - select site_node.url(node_id) - from site_nodes - where object_id = :package_id - - - begin Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql 14 Sep 2002 16:40:33 -0000 1.2 @@ -3,14 +3,6 @@ postgresql7.1 - - - select site_node__url(node_id) - from site_nodes - where object_id = :package_id - - - select pinds_blog_entry__new ( Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 12 Sep 2002 22:44:28 -0000 1.3 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 14 Sep 2002 16:40:33 -0000 1.4 @@ -5,22 +5,6 @@ @cvs-id $Id$ } -ad_proc -private lars_package_url_from_package_id_internal { - package_id -} { - Internal function to get SiteMap URL given a package_id -} { - return [db_string site_url { *SQL* }] -} - -ad_proc -public lars_package_url_from_package_id { - package_id -} { - Return the URL of the www pages of this package (cached) -} { - return [util_memoize "lars_package_url_from_package_id_internal {$package_id}"] -} - ad_proc -public lars_blog_entry_add { {-entry_id:required} {-package_id:required} @@ -72,4 +56,23 @@ # Flush both admin and non-admin version util_memoize_flush "lars_blog_get_as_string_mem $package_id 0" util_memoize_flush "lars_blog_get_as_string_mem $package_id 1" +} + +ad_proc -public lars_blog_public_package_url { + -package_id +} { + if { ![exists_and_not_null package_id] } { + # No package_id given, so we'll just use ad_conn + set package_id [ad_conn package_id] + set default_url [ad_conn package_url] + } else { + if { [catch { + # This will fail if the package has been mounted on more than one URL ... hm. + set default_url [apm_package_url_from_id $package_id] + }] } { + # In that case, we'll just hope that they set up the parameter + set default_url "" + } + } + return [ad_parameter -package_id $package_id "public_url" "lars-blogger" $default_url] } \ No newline at end of file Index: openacs-4/packages/lars-blogger/tcl/rss-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 14 Sep 2002 16:40:33 -0000 1.2 @@ -13,9 +13,11 @@ @author Lars Pind (lars@pinds.com) } { + set package_url [lars_blog_public_package_url -package_id $package_id] + set blog_title [db_string package_name { *SQL* }] - set blog_url "[ad_url][ad_parameter -package_id $package_id "public_url" "lars-blogger" [lars_package_url_from_package_id $package_id]]" + set blog_url "[ad_url]$package_url" set column_array(channel_title) $blog_title set column_array(channel_description) $blog_title @@ -41,7 +43,7 @@ set counter 0 db_foreach blog_rss_items { *SQL* } { - set entry_url "[ad_url][lars_package_url_from_package_id $package_id]archive/${entry_archive_url}#blog-entry-$entry_id" + set entry_url "[ad_url]${package_url}archive/${entry_archive_url}#blog-entry-$entry_id" set content [ns_adp_parse -string $content] Index: openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl 12 Sep 2002 22:44:28 -0000 1.2 +++ openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl 14 Sep 2002 16:40:33 -0000 1.3 @@ -7,7 +7,7 @@ } ad_proc -private lars_blog_weblogs_com_update_ping { - {-package_id} + {-package_id ""} {-location} {-timeout 30} {-depth 0} @@ -17,7 +17,9 @@ @author Jerry Asher (jerry@theashergroup.com) @author Lars Pind (lars@pinds.com) } { - if { ![info exists package_id] } { + set package_url [lars_blog_public_package_url -package_id $package_id] + + if { ![exists_and_not_null package_id] } { set package_id [ad_conn package_id] } @@ -31,13 +33,13 @@ set location [ad_parameter -package_id $package_id "weblogs_ping_url"] } if { [empty_string_p $location] } { - ns_log Error "lars_blog_weblogs_com_update_ping: No URL to post to" + ns_log Error "lars_blog_weblogs_com_update_ping: No URL to ping" return } set blog_title [db_string package_name { *SQL* }] - set blog_url "[ad_url][ad_parameter -package_id $package_id "public_url" "lars-blogger" [lars_package_url_from_package_id $package_id]]" + set blog_url "[ad_url]$package_url" ns_log notice "lars_blog_weblogs_com_update_ping:" if [catch { Index: openacs-4/packages/lars-blogger/www/admin-links.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/Attic/admin-links.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/admin-links.tcl 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/admin-links.tcl 14 Sep 2002 16:40:34 -0000 1.2 @@ -1,11 +1,7 @@ -set package_id [ad_conn package_id] +set admin_p [ad_permission_p [ad_conn package_id] admin] -set admin_p [ad_permission_p $package_id admin] - -set package_url [lars_package_url_from_package_id $package_id] - multirow create links url value title -multirow append links "${package_url}admin/entry-edit" "Add entry" "Add an entry to this blog" -multirow append links "${package_url}admin/" "Administer" "Visit the administration pages for this blog" +multirow append links "[ad_conn package_url]admin/entry-edit" "Add entry" "Add an entry to this blog" +multirow append links "[ad_conn package_url]admin/" "Administer" "Visit the administration pages for this blog" ad_return_template Index: openacs-4/packages/lars-blogger/www/archive-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/Attic/archive-display.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/archive-display.tcl 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/archive-display.tcl 14 Sep 2002 16:40:34 -0000 1.2 @@ -6,10 +6,8 @@ set package_id [ad_conn package_id] -set package_url [lars_package_url_from_package_id $package_id] +set admin_p [ad_permission_p [ad_conn package_id] admin] -set admin_p [ad_permission_p $package_id admin] - set page_title "[db_string package_name { *SQL* }] Archive" if { [empty_string_p $day] } { @@ -18,15 +16,15 @@ db_1row archive_date_month { *SQL* } - set context_bar [ad_context_bar [list "${package_url}archive/" "Archive"] $archive_date_pretty] + set context_bar [ad_context_bar [list "[ad_conn package_url]archive/" "Archive"] $archive_date_pretty] } else { set interval "day" db_1row archive_date_month_day { *SQL* } - set context_bar [ad_context_bar [list "${package_url}archive/" "Archive"] $archive_date_pretty] + set context_bar [ad_context_bar [list "[ad_conn package_url]archive/" "Archive"] $archive_date_pretty] } Index: openacs-4/packages/lars-blogger/www/blog-months.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-months.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/blog-months.tcl 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/blog-months.tcl 14 Sep 2002 16:40:34 -0000 1.2 @@ -1,9 +1,7 @@ set package_id [ad_conn package_id] -set package_url [lars_package_url_from_package_id $package_id] - db_multirow months months { *SQL* } { - set url "${package_url}archive/$month_url_stub" + set url "[ad_conn package_url]archive/$month_url_stub" } ad_return_template \ No newline at end of file Index: openacs-4/packages/lars-blogger/www/blog.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/www/blog.adp 12 Sep 2002 13:48:19 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/blog.adp 14 Sep 2002 16:40:34 -0000 1.4 @@ -4,11 +4,6 @@ @blog.entry_date_pretty@ - - - (Add entry) - - @@ -17,45 +12,15 @@
- -

@blog.title@

- - @blog.content@ -
- - - - - - - - - -
- -
- Posted by @blog.poster_first_names@ @blog.poster_last_name@ at @blog.posted_time_pretty@ - -      - Edit - Delete - - - Publish - - - Revoke - - - -
- # - - G - - - @blog.num_comments@ commentcomments - - - Add comment -
+
Archive Archive + +
+ Add entry + Add entry + + Index: openacs-4/packages/lars-blogger/www/blog.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/blog.tcl 12 Sep 2002 12:24:05 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/blog.tcl 14 Sep 2002 16:40:34 -0000 1.3 @@ -31,7 +31,7 @@ set show_poster_p [ad_parameter "ShowPosterP" "" "1"] -set package_url [lars_package_url_from_package_id $package_id] +set package_url [lars_blog_public_package_url] set admin_p [ad_permission_p $package_id admin] Index: openacs-4/packages/lars-blogger/www/entry-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lars-blogger/www/entry-chunk.adp 14 Sep 2002 16:40:34 -0000 1.1 @@ -0,0 +1,45 @@ + +

@blog.title@

+ +

+ @blog.content@ +
+ + + + + + + + + +
+ +
+ Posted by @blog.poster_first_names@ @blog.poster_last_name@ at @blog.posted_time_pretty@ + +      + Edit - + + Publish + + + Draft + + + +
+ # - + G - + Add comment +
+

+ + +
+

Comments

+
+ @comments_html@ +
+
Add comment
+ Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl 14 Sep 2002 16:40:34 -0000 1.1 @@ -0,0 +1,39 @@ +# Expects: +# blog:onerow +# show_comments_p:onevalue,optional +# retrun_url:onevalue,optional + +if { ![exists_and_not_null show_comments_p] } { + set show_comments_p "f" +} + +set package_id [ad_conn package_id] + +set admin_p [ad_permission_p $package_id admin] + +if { ![exists_and_not_null return_url] } { + set return_url "[ad_conn url]?[ad_conn query]" +} + +set show_poster_p [ad_parameter "ShowPosterP" "" "1"] + +set blog(title) [ad_quotehtml $blog(title)] +set blog(content) [ns_adp_parse -string $blog(content)] + +set entry_id $blog(entry_id) + +set blog(edit_url) "[ad_conn package_url]admin/entry-edit?[export_vars { entry_id return_url }]" +set blog(delete_url) "[ad_conn package_url]admin/entry-delete?[export_vars { entry_id return_url }]" + +set blog(publish_url) "[ad_conn package_url]admin/entry-publish?[export_vars { entry_id return_url }]" +set blog(revoke_url) "[ad_conn package_url]admin/entry-revoke?[export_vars { entry_id return_url }]" + +set blog(entry_archive_url) "[ad_conn package_url]one-entry?[export_vars { entry_id }]" +set blog(google_url) "http://www.google.com/search?[export_vars { {q $blog(title) } }]" +set blog(comment_add_url) "[general_comments_package_url]comment-add?[export_vars { { object_id $entry_id } { object_name $blog(title) } { return_url "[ad_conn package_url]flush-cache?[export_vars { return_url }]"} }]" + +if { [string equal $show_comments_p "t"] } { + set comments_html [general_comments_get_comments -print_content_p 1 $entry_id] +} + +ad_return_template \ No newline at end of file Index: openacs-4/packages/lars-blogger/www/one-entry.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/www/one-entry.adp 12 Sep 2002 14:14:54 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/one-entry.adp 14 Sep 2002 16:40:34 -0000 1.4 @@ -2,47 +2,4 @@ @page_title@ @context_bar@ - -

@blog.title@

- -

- @blog.content@ -
- - - - - - - - - -
- -
- Posted by @blog.poster_first_names@ @blog.poster_last_name@ at @blog.posted_time_pretty@ - -      - Edit - Delete - - - Publish - - - Revoke - - - -
- # - - G - - Add comment -
-

- - -
-

Comments

-
- @comments_html@ -
- + \ No newline at end of file Index: openacs-4/packages/lars-blogger/www/one-entry.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/one-entry.tcl 12 Sep 2002 14:14:54 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/one-entry.tcl 14 Sep 2002 16:40:34 -0000 1.3 @@ -27,22 +27,4 @@ set context_bar [ad_context_bar $page_title] -set blog(title) [ad_quotehtml $blog(title)] -set blog(content) [ns_adp_parse -string $blog(content)] -set blog(draft_p_checked) [ad_decode $blog(draft_p) "t" "checked" ""] - -set blog(edit_url) "[ad_conn package_url]admin/entry-edit?[export_vars -url { entry_id return_url }]" -set blog(delete_url) "[ad_conn package_url]admin/entry-delete?[export_vars -url { entry_id return_url }]" - -set blog(publish_url) "[ad_conn package_url]admin/entry-publish?[export_vars -url { entry_id return_url }]" -set blog(revoke_url) "[ad_conn package_url]admin/entry-revoke?[export_vars -url { entry_id return_url }]" - -set blog(entry_archive_url) "[ad_conn package_url]one-entry?[export_vars { entry_id }]" -set blog(google_url) "http://www.google.com/search?[export_vars { {q $blog(title) } }]" - - -set comments_html [general_comments_get_comments -print_content_p 1 $entry_id] - -set blog(comment_add_url) "[general_comments_package_url]comment-add?[export_vars -url { { object_id $entry_id } { object_name $blog(title) } { return_url "[ad_conn package_url]flush-cache?[export_vars -url { return_url }]"} }]" - ad_return_template \ No newline at end of file Index: openacs-4/packages/lars-blogger/www/one-entry.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/Attic/one-entry.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/www/one-entry.xql 12 Sep 2002 15:09:26 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/one-entry.xql 14 Sep 2002 16:40:34 -0000 1.4 @@ -4,7 +4,8 @@ - select b.title, + select b.entry_id, + b.title, b.content, b.draft_p, to_char(b.entry_date, 'YYYY-MM-DD') as entry_date, Index: openacs-4/packages/lars-blogger/www/admin/drafts.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/drafts.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/admin/drafts.adp 8 Sep 2002 11:29:23 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/admin/drafts.adp 14 Sep 2002 16:40:35 -0000 1.3 @@ -19,6 +19,7 @@ @draft_entries.content@ Preview + Publish Edit Delete Index: openacs-4/packages/lars-blogger/www/admin/drafts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/drafts.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/admin/drafts.tcl 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/admin/drafts.tcl 14 Sep 2002 16:40:35 -0000 1.2 @@ -11,11 +11,12 @@ set context_bar [ad_context_bar $page_title] -db_multirow draft_entries draft_entries { *SQL* } { +db_multirow -extend { edit_url publish_url delete_url preview_url } draft_entries draft_entries { *SQL* } { set return_url "[ad_conn url][ad_decode [ad_conn query] "" "" "?[ad_conn query]"]" - set edit_url "[ad_conn package_url]admin/entry-edit?[export_vars -url { entry_id return_url }]" - set delete_url "[ad_conn package_url]admin/entry-delete?[export_vars -url { entry_id return_url }]" - set preview_url "[ad_conn package_url]admin/entry-preview?[export_vars -url { entry_id return_url }]" + set edit_url "[ad_conn package_url]admin/entry-edit?[export_vars { entry_id return_url }]" + set delete_url "[ad_conn package_url]admin/entry-delete?[export_vars { entry_id return_url }]" + set preview_url "[ad_conn package_url]admin/entry-preview?[export_vars { entry_id return_url }]" + set publish_url "[ad_conn package_url]admin/entry-publish?[export_vars { entry_id return_url }]" set content [ns_adp_parse -string $content] } Index: openacs-4/packages/lars-blogger/www/admin/drafts.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/drafts.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/admin/drafts.xql 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/admin/drafts.xql 14 Sep 2002 16:40:35 -0000 1.2 @@ -7,10 +7,7 @@ select entry_id, to_char(entry_date, 'YYYY-MM-DD') as entry_date_pretty, title, - content, - '' as edit_url, - '' as delete_url, - '' as preview_url + content from pinds_blog_entries where package_id = :package_id and draft_p = 't' Index: openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl 12 Sep 2002 15:08:40 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl 14 Sep 2002 16:40:35 -0000 1.3 @@ -89,7 +89,7 @@ } if { [empty_string_p $return_url] } { - set return_url "entry-preview?[export_vars -url { entry_id }]" + set return_url "entry-preview?[export_vars { entry_id }]" } ad_returnredirect $return_url Index: openacs-4/packages/lars-blogger/www/admin/entry-preview.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-preview.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/admin/entry-preview.adp 8 Sep 2002 11:29:23 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/admin/entry-preview.adp 14 Sep 2002 16:40:35 -0000 1.3 @@ -2,19 +2,4 @@ @page_title@ @context_bar@ - -

@title@

- -

- @content@ - - (Edit) (Delete) - - (Publish) - - - (Revoke) - - -

- + Index: openacs-4/packages/lars-blogger/www/admin/entry-preview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-preview.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/admin/entry-preview.tcl 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/admin/entry-preview.tcl 14 Sep 2002 16:40:35 -0000 1.2 @@ -19,19 +19,7 @@ set context_bar [ad_context_bar $page_title] -db_1row entry { *SQL* } +db_1row entry { *SQL* } -column_array blog -set title_html [ad_quotehtml $title] -set content [ns_adp_parse -string $content] -set content_html [ad_quotehtml $content] -set entry_date_html [ad_quotehtml $entry_date] -set draft_p_checked [ad_decode $draft_p "t" "checked" ""] -set edit_url "[ad_conn package_url]admin/entry-edit?[export_vars -url { entry_id return_url }]" -set delete_url "[ad_conn package_url]admin/entry-delete?[export_vars -url { entry_id return_url }]" - -set publish_url "entry-publish?[export_vars -url { entry_id return_url }]" -set revoke_url "entry-revoke?[export_vars -url { entry_id return_url }]" - - ad_return_template \ No newline at end of file Index: openacs-4/packages/lars-blogger/www/admin/entry-preview.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-preview.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/admin/entry-preview.xql 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/admin/entry-preview.xql 14 Sep 2002 16:40:35 -0000 1.2 @@ -4,9 +4,20 @@ - select title, content, draft_p, to_char(entry_date, 'YYYY-MM-DD') as entry_date - from pinds_blog_entries - where entry_id = :entry_id + select b.entry_id, + b.title, + b.content, + b.draft_p, + to_char(b.entry_date, 'YYYY-MM-DD') as entry_date, + p.first_names as poster_first_names, + p.last_name as poster_last_name, + to_char(b.posted_date , 'HH24:MI') as posted_time_pretty + from pinds_blog_entries b, + acs_objects o, + persons p + where b.entry_id = :entry_id + and o.object_id = b.entry_id + and p.person_id = o.creation_user Index: openacs-4/packages/lars-blogger/www/admin/recently-published-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/recently-published-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/admin/recently-published-oracle.xql 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/admin/recently-published-oracle.xql 14 Sep 2002 16:40:35 -0000 1.2 @@ -8,12 +8,12 @@ select entry_id, to_char(entry_date, 'YYYY-MM-DD') as entry_date_pretty, title, - content, - '' as edit_url + content from pinds_blog_entries where package_id = :package_id and posted_date > sysdate - 14 and draft_p = 'f' + and deleted_p = 'f' order by entry_date desc, posted_date desc Index: openacs-4/packages/lars-blogger/www/admin/recently-published-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/recently-published-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/admin/recently-published-postgresql.xql 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/admin/recently-published-postgresql.xql 14 Sep 2002 16:40:35 -0000 1.2 @@ -8,12 +8,12 @@ select entry_id, to_char(entry_date, 'YYYY-MM-DD') as entry_date_pretty, title, - content, - '' as edit_url + content from pinds_blog_entries where package_id = :package_id and posted_date > current_timestamp - interval '14 days' and draft_p = 'f' + and deleted_p = 'f' order by entry_date desc, posted_date desc Index: openacs-4/packages/lars-blogger/www/admin/recently-published.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/recently-published.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/admin/recently-published.adp 8 Sep 2002 11:29:23 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/admin/recently-published.adp 14 Sep 2002 16:40:35 -0000 1.3 @@ -17,7 +17,7 @@ @entries.entry_date_pretty@ @entries.title@ @entries.content@ - Edit + Edit - View Index: openacs-4/packages/lars-blogger/www/admin/recently-published.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/recently-published.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/admin/recently-published.tcl 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/admin/recently-published.tcl 14 Sep 2002 16:40:35 -0000 1.2 @@ -11,9 +11,10 @@ set context_bar [ad_context_bar $page_title] -db_multirow entries entries { *SQL* } { +db_multirow -extend { edit_url preview_url } entries entries { *SQL* } { set return_url "[ad_conn url][ad_decode [ad_conn query] "" "" "?[ad_conn query]"]" - set edit_url "[ad_conn package_url]admin/entry-edit?[export_vars -url { entry_id return_url }]" + set edit_url "[ad_conn package_url]admin/entry-edit?[export_vars { entry_id return_url }]" + set preview_url "[ad_conn package_url]admin/entry-preview?[export_vars { entry_id return_url }]" } ad_return_template