Index: openacs-4/packages/lars-blogger/lars-blogger.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lars-blogger.info,v diff -u -r1.8.2.7 -r1.8.2.8 --- openacs-4/packages/lars-blogger/lars-blogger.info 11 May 2003 22:50:44 -0000 1.8.2.7 +++ openacs-4/packages/lars-blogger/lars-blogger.info 13 Jun 2003 09:15:00 -0000 1.8.2.8 @@ -2,39 +2,41 @@ - Lars Blogger - Lars Bloggers + Weblogger + Webloggers f f - - + weblog + + Lars Pind + Simon Carstensen Write your own web log - 2003-03-13 + 2003-06-10 Collaboraid - Manages multiple web logs for your site. Just mount multiple instances, and you can do all the blogging you want. + Manages multiple weblogs for your wbsite. - + - + - - - - - - + + + - + + - + + + Index: openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql 13 Mar 2003 17:04:18 -0000 1.2.2.2 +++ openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql 13 Jun 2003 09:15:00 -0000 1.2.2.3 @@ -33,7 +33,6 @@ package_id constraint pinds_blog_entry_package_id_fk references apm_packages(package_id), title varchar(500), - title_url varchar(500), content clob, content_format varchar(50) default 'text/html' Index: openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql 13 Mar 2003 17:04:18 -0000 1.1.2.2 +++ openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql 13 Jun 2003 09:15:00 -0000 1.1.2.3 @@ -14,7 +14,6 @@ entry_id in pinds_blog_entries.entry_id%TYPE default null, package_id in pinds_blog_entries.package_id%TYPE, title in pinds_blog_entries.title%TYPE default null, - title_url in pinds_blog_entries.title_url%TYPE default null, content in varchar default null, content_format in varchar default 'text/html', entry_date in pinds_blog_entries.entry_date%TYPE default null, @@ -42,7 +41,6 @@ entry_id in pinds_blog_entries.entry_id%TYPE default null, package_id in pinds_blog_entries.package_id%TYPE, title in pinds_blog_entries.title%TYPE default null, - title_url in pinds_blog_entries.title_url%TYPE default null, content in varchar default null, content_format in varchar default 'text/html', entry_date in pinds_blog_entries.entry_date%TYPE default null, @@ -67,7 +65,6 @@ entry_id, package_id, title, - title_url, content, content_format, entry_date, @@ -78,7 +75,6 @@ v_entry_id, pinds_blog_entry.new.package_id, pinds_blog_entry.new.title, - pinds_blog_entry.new.title_url, pinds_blog_entry.new.content, pinds_blog_entry.new.content_format, pinds_blog_entry.new.entry_date, Index: openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql 13 Mar 2003 17:04:18 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql 13 Jun 2003 09:15:00 -0000 1.1.2.2 @@ -56,7 +56,7 @@ insert into notification_types_intervals (type_id, interval_id) select v_foo, interval_id - from notification_intervals where name in ('instant','hourly','daily', 'weekly'); + from notification_intervals where name in ('instant','hourly','daily'); insert into notification_types_del_methods (type_id, delivery_method_id) Index: openacs-4/packages/lars-blogger/sql/oracle/rss-register.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/rss-register.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/sql/oracle/rss-register.sql 9 May 2003 22:42:33 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/sql/oracle/rss-register.sql 13 Jun 2003 09:15:00 -0000 1.1.2.2 @@ -7,10 +7,11 @@ -- declare + impl_id integer; foo integer; begin - foo := acs_sc_impl.new( + impl_id := acs_sc_impl.new( impl_contract_name => 'RssGenerationSubscriber', impl_name => 'pinds_blog_entries', impl_owner_name => 'lars-blogger' Index: openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql,v diff -u -r1.2.2.5 -r1.2.2.6 --- openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql 13 Mar 2003 17:05:07 -0000 1.2.2.5 +++ openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql 13 Jun 2003 09:15:00 -0000 1.2.2.6 @@ -119,6 +119,12 @@ ''f'' ); + PERFORM acs_permission__grant_permission( + v_entry_id, + p_creation_user, + ''admin'' + ); + return v_entry_id; end; ' language 'plpgsql'; @@ -137,5 +143,82 @@ ' language 'plpgsql'; +select acs_object_type__create_type ( + 'weblogger_channel', -- object_type + 'Weblogger Channel', -- pretty_name + 'Weblogger Channels', -- pretty_plural + 'acs_object', -- supertype + 'weblogger_channels', -- table_name + 'channel_id', -- id_column + null, -- package_name + 'f', -- abstract_p + null, -- type_extension_table + 'weblogger_channels.name' -- name_method +); + +create table weblogger_channels ( + channel_id integer + constraint channel_id_fk + references acs_objects(object_id) + constraint weblogger_channels_pk + primary key, + package_id integer + constraint weblogger_channels_package_id_kf + references apm_packages(package_id), + user_id integer +); + + + +create or replace function weblogger_channel__new ( + integer, -- channel_id + integer, -- package_id + integer, -- user_id + integer, -- creation_user + varchar -- creation_ip +) returns integer as ' +declare + p_channel_id alias for $1; + p_package_id alias for $2; + p_user_id alias for $3; + p_creation_user alias for $4; + p_creation_ip alias for $5; + v_channel_id integer; +begin + v_channel_id := acs_object__new ( + p_channel_id, + ''weblogger_channel'', + current_timestamp, + p_creation_user, + p_creation_ip, + p_package_id + ); + + insert into weblogger_channels ( + channel_id, + package_id, + user_id + ) values ( + v_channel_id, + p_package_id, + p_user_id + ); + + return v_channel_id; +end; +' language 'plpgsql'; + +create or replace function weblogger_channel__delete (integer) +returns integer as ' +declare + p_channel_id alias for $1; +begin + delete from weblogger_channels + where channel_id = p_channel_id; + PERFORM acs_object__delete(p_channel_id); + return 0; +end; +' language 'plpgsql'; + \i rss-register.sql \i notifications-init.sql Index: openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-drop.sql,v diff -u -r1.2.2.3 -r1.2.2.4 --- openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-drop.sql 13 Mar 2003 17:05:07 -0000 1.2.2.3 +++ openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-drop.sql 13 Jun 2003 09:15:00 -0000 1.2.2.4 @@ -34,7 +34,19 @@ select inline_0(); drop function inline_0(); +drop function weblogger_channel__new( + integer, -- channel_id + integer, -- package_id + integer, -- user_id + integer, -- creation_user + varchar -- creation_ip +); +drop function weblogger_channel__delete (integer); + +drop table weblogger_channels; +select acs_object_type__drop_type ('weblogger_channel', true); + drop function pinds_blog_entry__title (integer); drop function pinds_blog_entry__new( integer, -- entry_id Index: openacs-4/packages/lars-blogger/sql/postgresql/notifications-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/notifications-init.sql,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/lars-blogger/sql/postgresql/notifications-init.sql 13 Mar 2003 17:05:07 -0000 1.1.2.2 +++ openacs-4/packages/lars-blogger/sql/postgresql/notifications-init.sql 13 Jun 2003 09:15:00 -0000 1.1.2.3 @@ -56,7 +56,7 @@ insert into notification_types_intervals (type_id, interval_id) select v_foo, interval_id - from notification_intervals where name in (''instant'',''hourly'',''daily'',''weekly''); + from notification_intervals where name in (''instant'',''hourly'',''daily''); insert into notification_types_del_methods (type_id, delivery_method_id) Index: openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql 11 May 2003 22:51:15 -0000 1.1.2.4 +++ openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql 13 Jun 2003 09:15:01 -0000 1.1.2.5 @@ -11,6 +11,7 @@ b.content, b.content_format, b.draft_p, + o.creation_user as user_id, to_char(b.entry_date, 'YYYY-MM-DD') as entry_date, to_char(b.entry_date, 'fmDayfm, fmMonthfm fmDDfm, YYYY') as entry_date_pretty, p.first_names as poster_first_names, 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.2.2.2 -r1.2.2.3 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql 13 Mar 2003 17:05:38 -0000 1.2.2.2 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql 13 Jun 2003 09:15:01 -0000 1.2.2.3 @@ -5,19 +5,43 @@ - select pinds_blog_entry__new ( - :entry_id, - :package_id, - :title, - :title_url, - :content, - :content_format, - to_date(:entry_date, 'YYYY-MM-DD'), - :draft_p, - :creation_user, - :creation_ip + select pinds_blog_entry__new ( + :entry_id, + :package_id, + :title, + :title_url, + :content, + :content_format, + to_date(:entry_date, 'YYYY-MM-DD'), + :draft_p, + :creation_user, + :creation_ip ) + + + select weblogger_channel__new ( + :channel_id, + :package_id, + '', + :creation_user, + :creation_ip + ) + + + + + + select weblogger_channel__new ( + :channel_id, + :package_id, + :creation_user, + :creation_user, + :creation_ip + ) + + + 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.7.2.2 -r1.7.2.3 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 13 Mar 2003 17:05:38 -0000 1.7.2.2 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 13 Jun 2003 09:15:01 -0000 1.7.2.3 @@ -20,7 +20,7 @@ set creation_user [ad_conn user_id] set creation_ip [ns_conn peeraddr] - set entry_id [db_exec_plsql entry_add { *SQL* }] + set entry_id [db_exec_plsql entry_add {}] # If publish directly if { [string equal $draft_p "f"] } { @@ -32,11 +32,73 @@ lars_blog_flush_cache $package_id + set timeout [expr 30*60] + set channel_title [lars_blog_name] + + if { [parameter::get -parameter "package_rss_feed_p" -default 1]} { + # check whether there's been a feed setup for this instance + + set exists_instance_feed_p [db_string exists_instance_feed_p {}] + + if { [string equal $exists_instance_feed_p "0"] } { + + #setup an RSS feed for this instance + + db_transaction { + + set channel_link [lars_blog_public_package_url] + + set channel_id [db_nextval "acs_object_id_seq"] + + set summary_context_id [db_string create_instance_channel {}] + + set subscr_id [db_string create_subscr {}] + + db_dml update_subscr {} + + # Run it now + rss_gen_report $subscr_id + + } + } + } + + if {[parameter::get -parameter "user_rss_feed_p" -default 0]} { + + # check whether there's been a feed setup for this user + + ns_log "Notice" "SIMON" + + set exists_user_feed_p [db_string exists_user_feed_p {}] + + set screen_name [db_string screen_name {}] + + if { [string equal $exists_user_feed_p "0"] && ![empty_string_p $screen_name] } { + + #setup an RSS feed for the user + + db_transaction { + + set channel_link "[lars_blog_public_package_url]user/$screen_name/" + + set channel_id [db_nextval "acs_object_id_seq"] + + set summary_context_id [db_string create_user_channel {}] + + set subscr_id [db_string create_subscr {}] + + db_dml update_subscr {} + + # Run it now + rss_gen_report $subscr_id + + } + } + } return $entry_id } - ad_proc -private lars_blog_get_as_string_mem { package_id admin_p Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql 9 May 2003 22:43:00 -0000 1.1.2.2 +++ openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql 13 Jun 2003 09:15:01 -0000 1.1.2.3 @@ -23,7 +23,7 @@ 0 as tzoffset_minute, to_char(entry_date, 'DD Mon YYYY hh12:MI am') as entry_date_pretty, to_char(entry_date, 'YYYY/MM/') as entry_archive_url - from pinds_blog_entries + from pinds_blog_entries where package_id = :package_id and draft_p = 'f' and deleted_p = 'f' @@ -32,6 +32,32 @@ + + + select * + from (select entry_id, + title, + content, + entry_date, + posted_date, + to_char(posted_date, 'YYYY-MM-DD') as posted_date_string, + to_char(posted_date, 'HH:MI') as posted_time_string, + -6 as tzoffset_hour, + 0 as tzoffset_minute, + to_char(entry_date, 'DD Mon YYYY hh12:MI am') as entry_date_pretty, + to_char(entry_date, 'YYYY/MM/') as entry_archive_url + from pinds_blog_entries e join + acs_objects o on (o.object_id = e.entry_id) join + users u on (u.user_id = o.creation_user) + where e.package_id = :package_id + and o.creation_user = :user_id + and e.draft_p = 'f' + and e.deleted_p = 'f' + order by e.entry_date desc, e.posted_date desc) + where rownum < 11 + + + select nvl ((max(posted_date)-to_date('1970-01-01'))*60*60*24,0) as last_update @@ -42,4 +68,16 @@ + + + select nvl ((max(posted_date)-to_date('1970-01-01'))*60*60*24,0) as last_update + from pinds_blog_entries e join + acs_objects o on (o.object_id = e.entry_id) + where e.package_id = :package_id + and o.creation_user = :user_id + and e.draft_p = 'f' + and e.deleted_p = 'f' + + + Index: openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql 2 Mar 2003 22:46:09 -0000 1.1.2.3 +++ openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql 13 Jun 2003 09:15:01 -0000 1.1.2.4 @@ -32,6 +32,32 @@ + + + select entry_id, + title, + content, + entry_date, + posted_date, + to_char(posted_date, 'YYYY-MM-DD') as posted_date_string, + to_char(posted_date, 'HH:MI') as posted_time_string, + extract(timezone_hour from now()) as tzoffset_hour, + extract(timezone_minute from now()) as tzoffset_minute, + to_char(entry_date, 'DD Mon YYYY hh12:MI am') as entry_date_pretty, + to_char(entry_date, 'YYYY/MM/') as entry_archive_url + + from pinds_blog_entries e join + acs_objects o on (o.object_id = e.entry_id) join + users u on (u.user_id = o.creation_user) + where e.package_id = :package_id + and o.creation_user = :user_id + and e.draft_p = 'f' + and e.deleted_p = 'f' + order by e.entry_date desc, e.posted_date desc + limit 10 + + + select coalesce (date_part('epoch', @@ -44,4 +70,18 @@ + + + select coalesce (date_part('epoch', + max(e.posted_date::timestamptz) + ),0) as last_update + from pinds_blog_entries e join + acs_objects o on (o.object_id = e.entry_id) + where e.package_id = :package_id + and o.creation_user = :user_id + and e.draft_p = 'f' + and e.deleted_p = 'f' + + + 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.2.2.2 -r1.2.2.3 --- openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 4 Nov 2002 16:23:12 -0000 1.2.2.2 +++ openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 13 Jun 2003 09:15:01 -0000 1.2.2.3 @@ -6,22 +6,29 @@ } ad_proc -private lars_blog__rss_datasource { - package_id + summary_context_id } { This procedure implements the "datasource" operation of the RssGenerationSubscriber service contract. @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* }] + db_transaction { + + db_1row package_id {} + + set package_url [lars_blog_public_package_url -package_id $package_id] + + set blog_title [db_string package_name {}] - set blog_url "[ad_url]$package_url" - + set blog_url "[ad_url]$package_url" + + } + set column_array(channel_title) $blog_title set column_array(channel_description) $blog_title - set column_array(channel_pubDate) [db_string now { *SQL* }] + set column_array(channel_pubDate) [db_string now {}] set column_array(version) 1.00 @@ -42,7 +49,14 @@ set items [list] set counter 0 - db_foreach blog_rss_items { *SQL* } { + + if { [string equal $user_id 0] } { + set statement "blog_rss_items" + } else { + set statement "user_blog_rss_items" + } + + db_foreach $statement {} { set TZoffset [format "%+03d:%02d" $tzoffset_hour $tzoffset_minute] set entry_url "[ad_url]${package_url}archive/${entry_archive_url}#blog-entry-$entry_id" @@ -77,21 +91,20 @@ } ad_proc -private lars_blog__rss_lastUpdated { - package_id + summary_context_id } { Returns the time that the last blog entry was posted, in Unix time. Returns 0 otherwise. @author Lars Pind (lars@pinds.com) } { - db_0or1row get_last_update { - select coalesce (date_part('epoch', - max(posted_date::timestamp with time zone) - ),0) as last_update - from pinds_blog_entries - where package_id = :package_id - and draft_p = 'f' - and deleted_p = 'f' + + db_1row package_id {} + + if { [string equal $user_id 0] } { + db_0or1row get_last_update {} + } else { + db_0or1row get_last_user_update {} } return $last_update Index: openacs-4/packages/lars-blogger/tcl/rss-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/lars-blogger/tcl/rss-procs.xql 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/tcl/rss-procs.xql 13 Jun 2003 09:15:01 -0000 1.1.2.1 @@ -2,10 +2,22 @@ + + + select package_id, user_id from weblogger_channels where channel_id = :summary_context_id + + + select instance_name from apm_packages where package_id = :package_id + + + select package_id, user_id from weblogger_channels where channel_id = :summary_context_id + + + Index: openacs-4/packages/lars-blogger/www/blog-months-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-months-oracle.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/lars-blogger/www/blog-months-oracle.xql 14 Sep 2002 18:37:58 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/blog-months-oracle.xql 13 Jun 2003 09:15:01 -0000 1.2.2.1 @@ -3,7 +3,7 @@ oracle8.1.6 - + select trunc(entry_date, 'month') as month_date, to_char(trunc(entry_date, 'month'), 'fmMonthfm YYYY') @@ -18,4 +18,21 @@ + + + select trunc(entry_date, 'month') as month_date, + to_char(trunc(entry_date, 'month'), 'fmMonthfm YYYY') + as date_pretty, + to_char(trunc(entry_date, 'month'), 'YYYY/MM/') + as month_url_stub + from pinds_blog_entries e, users u + where draft_p = 'f' + and package_id = :package_id + and screen_name = :screen_name + and u.user_id = e.user_id + group by trunc(entry_date, 'month') + order by month_date desc + + + Index: openacs-4/packages/lars-blogger/www/blog-months-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-months-postgresql.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/lars-blogger/www/blog-months-postgresql.xql 14 Sep 2002 18:37:58 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/blog-months-postgresql.xql 13 Jun 2003 09:15:01 -0000 1.2.2.1 @@ -3,7 +3,7 @@ postgresql7.1 - + select date_trunc('month', entry_date) as month_date, to_char(date_trunc('month', entry_date), 'fmMonthfm YYYY') @@ -18,4 +18,22 @@ + + + select date_trunc('month', entry_date) as month_date, + to_char(date_trunc('month', entry_date), 'fmMonthfm YYYY') + as date_pretty, + to_char(date_trunc('month', entry_date), 'YYYY/MM/') + as month_url_stub + from pinds_blog_entries e join + acs_objects o on (o.object_id = e.entry_id) join + users u on (u.user_id = o.creation_user) + where package_id = :package_id + and draft_p = 'f' + and screen_name = :screen_name + group by month_date + order by month_date desc + + + 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.3 -r1.3.2.1 --- openacs-4/packages/lars-blogger/www/blog-months.tcl 14 Sep 2002 18:37:58 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/blog-months.tcl 13 Jun 2003 09:15:01 -0000 1.3.2.1 @@ -1,7 +1,13 @@ set package_id [ad_conn package_id] -db_multirow -extend { url } months months { *SQL* } { - set url "[ad_conn package_url]archive/$month_url_stub" +if [empty_string_p $screen_name] { + db_multirow -extend { url } months all_blog_months { *SQL* } { + set url "[ad_conn package_url]archive/$month_url_stub" + } +} else { + db_multirow -extend { url } months one_blog_months { *SQL* } { + set url "[ad_conn package_url]user/$screen_name/archive/$month_url_stub" + } } -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/lars-blogger/www/blog-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-oracle.xql,v diff -u -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/lars-blogger/www/blog-oracle.xql 13 Mar 2003 17:05:51 -0000 1.2.2.2 +++ openacs-4/packages/lars-blogger/www/blog-oracle.xql 13 Jun 2003 09:15:01 -0000 1.2.2.3 @@ -3,38 +3,25 @@ oracle8.1.6 - + - trunc(entry_date, 'MONTH') = :archive_date + trunc(entry_date, :archive_interval) = :archive_date - - - trunc(entry_date, 'DD') = :archive_date - - - entry_date > sysdate - 30 - - - and rownum < 3 - - - select entry_id, to_char(entry_date, 'fmDayfm, Month fmDDfm, YYYY') as entry_date_pretty, to_char(entry_date, 'YYYY/MM/DD/') as entry_archive_url, to_char(entry_date, 'YYYY-MM-DD') as entry_date, title, - title_url, content, content_format, draft_p, @@ -54,7 +41,6 @@ and $date_clause and draft_p = 'f' and deleted_p = 'f' - $limit_clause order by entry_date desc, posted_date desc Index: openacs-4/packages/lars-blogger/www/blog-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-postgresql.xql,v diff -u -r1.3.2.3 -r1.3.2.4 --- openacs-4/packages/lars-blogger/www/blog-postgresql.xql 13 Mar 2003 17:05:51 -0000 1.3.2.3 +++ openacs-4/packages/lars-blogger/www/blog-postgresql.xql 13 Jun 2003 09:15:01 -0000 1.3.2.4 @@ -3,31 +3,19 @@ postgresql7.1 - + date_trunc(:archive_interval, entry_date) = :archive_date - - - date_trunc(:archive_interval, entry_date) = :archive_date - - - entry_date > current_timestamp - interval '30 days' - - - limit 3 - - - - + select entry_id, to_char(entry_date, 'fmDayfm, Month fmDDfm, YYYY') as entry_date_pretty, @@ -40,6 +28,7 @@ draft_p, p.first_names as poster_first_names, p.last_name as poster_last_name, + o.creation_user as user_id, to_char(posted_date , 'HH24:MI') as posted_time_pretty, (select count(gc.comment_id) from general_comments gc, cr_revisions cr @@ -53,8 +42,38 @@ and draft_p = 'f' and deleted_p = 'f' order by entry_date desc, posted_date desc - $limit_clause + + + select entry_id, + to_char(entry_date, 'fmDayfm, Month fmDDfm, YYYY') as entry_date_pretty, + to_char(entry_date, 'YYYY/MM/DD/') as entry_archive_url, + to_char(entry_date, 'YYYY-MM-DD') as entry_date, + title, + content, + content_format, + draft_p, + p.first_names as poster_first_names, + p.last_name as poster_last_name, + o.creation_user as user_id, + to_char(posted_date , 'HH24:MI') as posted_time_pretty, + (select count(gc.comment_id) + from general_comments gc, cr_revisions cr + where gc.object_id = entry_id + and content_item__get_live_revision(gc.comment_id) = cr.revision_id) as num_comments + from users u, pinds_blog_entries e join + acs_objects o on (o.object_id = e.entry_id) join + persons p on (p.person_id = o.creation_user) + where package_id = :package_id + and u.user_id = o.creation_user + and u.screen_name = :screen_name + and $date_clause + and draft_p = 'f' + and deleted_p = 'f' + order by entry_date desc, posted_date desc + + + 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.9.2.4 -r1.9.2.5 --- openacs-4/packages/lars-blogger/www/blog.adp 9 May 2003 22:43:19 -0000 1.9.2.4 +++ openacs-4/packages/lars-blogger/www/blog.adp 13 Jun 2003 09:15:01 -0000 1.9.2.5 @@ -2,14 +2,12 @@
- @blog.entry_date_pretty@ + @blog.entry_date_pretty@ - - + - + + @blog_name@ @@ -20,7 +18,7 @@
- +
@@ -34,13 +32,9 @@ » Archive
- - + + » Add entry - - -

@notification_chunk@

-

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.8.2.4 -r1.8.2.5 --- openacs-4/packages/lars-blogger/www/blog.tcl 27 Mar 2003 13:11:37 -0000 1.8.2.4 +++ openacs-4/packages/lars-blogger/www/blog.tcl 13 Jun 2003 09:15:01 -0000 1.8.2.5 @@ -1,9 +1,9 @@ -# no ad_page_contract because this is intended to be included in other files -# package_id:integer,optional -# url:optional -# {type "current"} (allowed values: current archive) -# {archive_interval ""} -# {archive_date ""} +# Expects: +# package_id:optional +# url:optional +# type:optional (current, archive) +# archive_interval:optional +# archive_date:optional # If the caller specified a URL, then we gather the package_id from that URL if { [info exists url] } { @@ -22,14 +22,14 @@ switch -exact $type { archive { - set date_clause "[db_map date_clause_archive_$archive_interval]" + set date_clause "[db_map date_clause_archive]" } default { set date_clause "[db_map date_clause_default]" } } -set show_poster_p [parameter::get -package_id $package_id -parameter "ShowPosterP" -default "1"] +set show_poster_p [ad_parameter "ShowPosterP" "" "1"] set package_url [lars_blog_public_package_url -package_id $package_id] @@ -41,34 +41,24 @@ set blog_url {} } -set admin_p [ad_permission_p $package_id admin] +set count 0 -set limit_clause {} +if [empty_string_p $screen_name] { + + db_multirow blog all_blogs { *SQL* } + set archive_url "${package_url}archive/" -if { ![string equal $type "archive"] } { - set num_entries [db_string num_entries {}] +} else { - if { $num_entries < 3 } { - set date_clause {1=1} - set limit_clause [db_map limit_clause] - } + db_multirow blog blog { *SQL* } + set archive_url "${package_url}user/$screen_name/archive/" + } -db_multirow blog blog {} - -set archive_url "${package_url}archive/" set arrow_url "${package_url}graphics/arrow-box.gif" -set entry_add_url "${package_url}admin/entry-edit" +set entry_add_url "${package_url}entry-edit" set header_background_color [lars_blog_header_background_color -package_id $package_id] -if { [catch { - set notification_chunk [notification::display::request_widget \ - -type lars_blogger_notif \ - -object_id [ad_conn package_id] \ - -pretty_name [lars_blog_name] \ - -url [lars_blog_public_package_url]] -}] } { - set notification_chunk {} -} +ad_return_template Index: openacs-4/packages/lars-blogger/www/calendar-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/calendar-postgresql.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/www/calendar-postgresql.xql 13 Mar 2003 14:30:31 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/www/calendar-postgresql.xql 13 Jun 2003 09:15:01 -0000 1.1.2.2 @@ -3,7 +3,7 @@ postgresql7.1 - + select to_char(entry_date, 'J') as entry_date_julian from pinds_blog_entries @@ -13,4 +13,18 @@ group by entry_date_julian + + + + select to_char(entry_date, 'J') as entry_date_julian + from pinds_blog_entries e join + acs_objects o on (o.object_id = e.entry_id) join + users u on (u.user_id = o.creation_user) + where package_id = :package_id + and screen_name = :screen_name + and draft_p = 'f' + and deleted_p = 'f' + group by entry_date_julian + + Index: openacs-4/packages/lars-blogger/www/calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/calendar.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/lars-blogger/www/calendar.tcl 16 Sep 2002 15:04:27 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/calendar.tcl 13 Jun 2003 09:15:01 -0000 1.3.2.1 @@ -19,18 +19,42 @@ set package_id [ad_conn package_id] -db_foreach entry_dates { * SQL * } { - ns_set put $calendar_details $entry_date_julian "1" +if {[empty_string_p $screen_name]} { + db_foreach all_entry_dates { * SQL * } { + ns_set put $calendar_details $entry_date_julian "1" + } +} else { + db_foreach entry_dates { * SQL * } { + ns_set put $calendar_details $entry_date_julian "1" + } } +if {[empty_string_p $screen_name]} { + + set day_number_template "\[ad_decode \[ns_set get \$calendar_details \$julian_date\] 1 \"\$day_number\" \$day_number\]" + +} else { + + set day_number_template "\[ad_decode \[ns_set get \$calendar_details \$julian_date\] 1 \"\$day_number\" \$day_number\]" + +} + set widget [dt_widget_month_small \ -date $date \ -calendar_details $calendar_details \ - -day_number_template "\[ad_decode \[ns_set get \$calendar_details \$julian_date\] 1 \"\$day_number\" \$day_number\]"] + -day_number_template $day_number_template] -set prev_month_url "${package_url}archive/[clock format [clock scan $prev_month] -format %Y/%m]/" -set next_month_url "${package_url}archive/[clock format [clock scan $next_month] -format %Y/%m]/" +if {[empty_string_p $screen_name]} { + set prev_month_url "${package_url}archive/[clock format [clock scan $prev_month] -format %Y/%m]/" + set next_month_url "${package_url}archive/[clock format [clock scan $next_month] -format %Y/%m]/" + +} else { + + set prev_month_url "${package_url}user/$screen_name/archive/[clock format [clock scan $prev_month] -format %Y/%m]/" + set next_month_url "${package_url}user/$screen_name/archive/[clock format [clock scan $next_month] -format %Y/%m]/" + +} # Add year to the link append next_month_name " [string range $next_month 0 3]" append prev_month_name " [string range $prev_month 0 3]" Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/drafts-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/drafts-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/drafts.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/drafts.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/drafts.xql'. Fisheye: No comparison available. Pass `N' to diff? 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 -r1.2.2.6 -r1.2.2.7 --- openacs-4/packages/lars-blogger/www/entry-chunk.adp 26 Mar 2003 16:01:29 -0000 1.2.2.6 +++ openacs-4/packages/lars-blogger/www/entry-chunk.adp 13 Jun 2003 09:15:01 -0000 1.2.2.7 @@ -11,9 +11,8 @@

@blog.title@

 - @blog.content@ - +


@@ -22,7 +21,7 @@
Posted by @blog.poster_first_names@ @blog.poster_last_name@ at @blog.posted_time_pretty@ - +      Edit - 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 -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/lars-blogger/www/entry-chunk.tcl 13 Mar 2003 17:05:51 -0000 1.3.2.2 +++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl 13 Jun 2003 09:15:01 -0000 1.3.2.3 @@ -13,29 +13,39 @@ 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 package_url [lars_blog_public_package_url -package_id $package_id] +set user_id [ad_conn user_id] + set general_comments_package_url [general_comments_package_url] -set show_poster_p [parameter::get -package_id $package_id -parameter "ShowPosterP" -default "1"] +set show_poster_p [ad_parameter "ShowPosterP" "" "1"] -lars_blogger::entry::htmlify -array blog +set blog(title) [ad_quotehtml $blog(title)] +# LARS: +# Not sure we should do the ns_adp_parse thing here, but heck, why not +# It should be safe, given the security checks +set blog(content) [ns_adp_parse -string [ad_html_text_convert -from $blog(content_format) -to "text/html" $blog(content)]] + set entry_id $blog(entry_id) -set blog(edit_url) "${package_url}admin/entry-edit?[export_vars { entry_id return_url }]" -set blog(delete_url) "${package_url}admin/entry-delete?[export_vars { entry_id return_url }]" +set blog(edit_url) "${package_url}entry-edit?[export_vars { entry_id return_url }]" +set blog(delete_url) "${package_url}entry-delete?[export_vars { entry_id return_url }]" -set blog(publish_url) "${package_url}admin/entry-publish?[export_vars { entry_id return_url }]" -set blog(revoke_url) "${package_url}admin/entry-revoke?[export_vars { entry_id return_url }]" +set blog(publish_url) "${package_url}entry-publish?[export_vars { entry_id return_url }]" +set blog(revoke_url) "${package_url}entry-revoke?[export_vars { entry_id return_url }]" -set blog(entry_archive_url) "${package_url}one-entry?[export_vars { entry_id }]" +if { [empty_string_p $screen_name] } { + set blog(entry_archive_url) "${package_url}one-entry?[export_vars { entry_id }]" +} else { + set blog(entry_archive_url) "${package_url}user/$screen_name/one-entry?[export_vars { entry_id }]" +} + set blog(google_url) "http://www.google.com/search?[export_vars { {q $blog(title) } }]" if { ![empty_string_p $general_comments_package_url] } { Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-delete.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-delete.tcl~'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-delete.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-edit.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-edit.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-edit.tcl~'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-edit.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-publish-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-publish-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-publish.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-revoke.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-revoke.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lars-blogger/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.adp,v diff -u -r1.9.2.4 -r1.9.2.5 --- openacs-4/packages/lars-blogger/www/index.adp 13 Mar 2003 17:05:51 -0000 1.9.2.4 +++ openacs-4/packages/lars-blogger/www/index.adp 13 Jun 2003 09:15:01 -0000 1.9.2.5 @@ -5,10 +5,26 @@ @context_bar@ + + + + + + + +
@@ -29,25 +45,25 @@ - + - + - + @@ -67,7 +83,7 @@ - +
- + @@ -20,7 +36,7 @@
- +
Actions
- Add entry
- Draft entries
- Administer + Add entry
+ Draft entries + +
Administer +
-
- 		 
Archive @@ -103,3 +119,4 @@
+ Index: openacs-4/packages/lars-blogger/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.tcl,v diff -u -r1.4.2.6 -r1.4.2.7 --- openacs-4/packages/lars-blogger/www/index.tcl 9 May 2003 22:43:19 -0000 1.4.2.6 +++ openacs-4/packages/lars-blogger/www/index.tcl 13 Jun 2003 09:15:01 -0000 1.4.2.7 @@ -4,34 +4,66 @@ @author Lars Pind (lars@pinds.com) @creation-date February 2002 } { + screen_name:optional year:optional,string_length_range(4|4) month:optional,string_length_range(2|2) day:optional,string_length_range(2|2) -} -properties { - context_bar - page_title } -set context_bar [ad_context_bar] - set page_title [lars_blog_name] -if { ![empty_string_p [parameter::get -parameter "rss_file_url"]] } { - set rss_file_url "[ad_url][lars_blog_public_package_url][parameter::get -parameter "rss_file_url"]" +if {![exists_and_not_null screen_name]} { + set screen_name "" + set context_bar [ad_context_bar] +} else { + set context_bar [ad_context_bar $screen_name] } -set admin_p [ad_permission_p [ad_conn package_id] admin] +if { ![empty_string_p [parameter::get -parameter "rss_file_name"]] } { -if { [catch { - set notification_chunk [notification::display::request_widget \ - -type lars_blogger_notif \ - -object_id [ad_conn package_id] \ - -pretty_name [lars_blog_name] \ - -url [lars_blog_public_package_url]] -}] } { - set notification_chunk {} + if {[exists_and_not_null screen_name]} { + set rss_file_url "[ad_url][lars_blog_public_package_url]user/$screen_name/[parameter::get -parameter "rss_file_name"]" + } else { + set rss_file_url "[ad_url][lars_blog_public_package_url][parameter::get -parameter "rss_file_name"]" + } + } +set package_id [ad_conn package_id] + +set package_url [ad_conn package_url] + +set write_p [ad_permission_p $package_id write] + +if {[parameter::get -parameter "AllowUsersToPost" -default 0] || $write_p} { + set registered_p [ad_conn user_id] +} else { + set registered_p 0 +} + +set display_users_p [parameter::get -parameter "DisplayUsersP" -default 0] + +if {$display_users_p && ![exists_and_not_null screen_name]} { + + set display_bloggers_p 1 + + db_multirow bloggers bloggers { *SQL* } + + ad_return_template + +} else { + + set display_bloggers_p 0 + +} + +set notification_chunk [notification::display::request_widget \ + -type lars_blogger_notif \ + -object_id [ad_conn package_id] \ + -pretty_name [lars_blog_name] \ + -url [lars_blog_public_package_url] \ +] + set header_background_color [lars_blog_header_background_color] if { [exists_and_not_null year] } { @@ -43,11 +75,19 @@ if { [exists_and_not_null day] } { set interval "day" db_1row archive_date_month_day { *SQL* } - set context_bar [ad_context_bar [list "[ad_conn package_url]archive/" "Archive"] [list "[ad_conn package_url]archive/$year/$month/" $archive_month_pretty] $archive_date_pretty] + if {[empty_string_p $screen_name]} { + set context_bar [ad_context_bar [list "$package_url/archive/" "Archive"] [list "$package_url/archive/$year/$month/" $archive_month_pretty] $archive_date_pretty] + } else { + set context_bar [ad_context_bar [list "$package_url/user/$screen_name/" "$screen_name"] [list "$package_url/user/$screen_name/archive/" "Archive"] [list "$package_url/user/$screen_name/archive/$year/$month/" $archive_month_pretty] $archive_date_pretty] + } } else { set interval "month" db_1row archive_date_month { *SQL* } - set context_bar [ad_context_bar [list "[ad_conn package_url]archive/" "Archive"] $archive_date_pretty] + if {[empty_string_p $screen_name]} { + set context_bar [ad_context_bar [list "$package_url/archive/" "Archive"] $archive_date_pretty] + } else { + set context_bar [ad_context_bar [list "$package_url/user/$screen_name/" "$screen_name"] [list "$package_url/user/$screen_name/archive/" "Archive"] $archive_date_pretty] + } } append page_title " Archive" Index: openacs-4/packages/lars-blogger/www/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/lars-blogger/www/index.xql 16 Sep 2002 09:25:51 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/index.xql 13 Jun 2003 09:15:01 -0000 1.3.2.1 @@ -24,4 +24,14 @@ + + + select distinct screen_name + from pinds_blog_entries e join + acs_objects o on (o.object_id = e.entry_id) join + users u on (u.user_id = o.creation_user) + where package_id = :package_id + + + 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.6.2.1 -r1.6.2.2 --- openacs-4/packages/lars-blogger/www/one-entry.adp 13 Mar 2003 17:05:51 -0000 1.6.2.1 +++ openacs-4/packages/lars-blogger/www/one-entry.adp 13 Jun 2003 09:15:01 -0000 1.6.2.2 @@ -1,6 +1,6 @@ @page_title@ -@context@ +@context_bar@ @@ -10,4 +10,4 @@
- + 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.5.2.1 -r1.5.2.2 --- openacs-4/packages/lars-blogger/www/one-entry.tcl 13 Mar 2003 17:05:51 -0000 1.5.2.1 +++ openacs-4/packages/lars-blogger/www/one-entry.tcl 13 Jun 2003 09:15:01 -0000 1.5.2.2 @@ -2,25 +2,33 @@ entry_id:integer {return_url ""} } -properties { - context - blog:onerow - header_background_color - page_title + context_bar + title_html + content_html + draft_p_checked + entry_date_html + form_export_vars + return_url } set package_id [ad_conn package_id] -set admin_p [ad_permission_p $package_id admin] - if { [empty_string_p $return_url] } { set return_url "[ad_conn url]?[ad_conn query]" } +set show_poster_p [ad_parameter "ShowPosterP" "" "1"] + lars_blogger::entry::get -entry_id $entry_id -array blog set page_title $blog(title) -set context [list $page_title] +if {![exists_and_not_null screen_name]} { + set screen_name "" + set context_bar [ad_context_bar $page_title] +} else { + set context_bar [ad_context_bar $screen_name] +} set header_background_color [lars_blog_header_background_color] Index: openacs-4/packages/lars-blogger/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/index.adp,v diff -u -r1.3.2.3 -r1.3.2.4 --- openacs-4/packages/lars-blogger/www/admin/index.adp 9 May 2003 22:43:51 -0000 1.3.2.3 +++ openacs-4/packages/lars-blogger/www/admin/index.adp 13 Jun 2003 09:15:02 -0000 1.3.2.4 @@ -8,12 +8,12 @@

» - Add new blog entry + Add new blog entry

» - View draft entries + View draft entries

Index: openacs-4/packages/lars-blogger/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/index.tcl,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/lars-blogger/www/admin/index.tcl 9 May 2003 22:43:51 -0000 1.1.2.2 +++ openacs-4/packages/lars-blogger/www/admin/index.tcl 13 Jun 2003 09:15:02 -0000 1.1.2.3 @@ -21,6 +21,6 @@ set rss_manage_url "[apm_package_url_from_key "rss-support"]my-subscrs" -if { ![empty_string_p [parameter::get -parameter "rss_file_url"]] } { +if { ![empty_string_p [parameter::get -parameter "rss_file_name"]] } { set rss_file_url "[ad_url][lars_blog_public_package_url][parameter::get -parameter "rss_file_url"]" } Index: openacs-4/packages/lars-blogger/www/admin/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/index.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/www/admin/index.xql 13 Mar 2003 14:31:02 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/www/admin/index.xql 13 Jun 2003 09:15:02 -0000 1.1.2.2 @@ -13,8 +13,9 @@ select count(*) from rss_gen_subscrs s, - acs_sc_impls i - where s.summary_context_id = :package_id + acs_sc_impls i, weblogger_channels w + where w.package_id = :package_id + and s.summary_context_id = w.channel_id and s.impl_id = i.impl_id and i.impl_name = 'pinds_blog_entries' and i.impl_owner_name = 'lars-blogger' Index: openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl 9 May 2003 22:43:51 -0000 1.1.2.2 +++ openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl 13 Jun 2003 09:15:02 -0000 1.1.2.3 @@ -15,8 +15,8 @@ db_transaction { - if { [empty_string_p [parameter::get -parameter "rss_file_url"]] } { - parameter::set_value -parameter "rss_file_url" -value "rss/rss.xml" + if { [empty_string_p [parameter::get -parameter "rss_file_name"]] } { + parameter::set_value -parameter "rss_file_name" -value "rss/rss.xml" } set subscr_id [db_exec_plsql create_subscr {}] Index: openacs-4/packages/lars-blogger/www/admin/subscribers.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/subscribers.adp,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/lars-blogger/www/admin/subscribers.adp 13 Mar 2003 14:31:02 -0000 1.1.2.2 +++ openacs-4/packages/lars-blogger/www/admin/subscribers.adp 13 Jun 2003 09:15:02 -0000 1.1.2.3 @@ -3,15 +3,14 @@ subscribers -

- No subscribers. - +No subscribers. + \ No newline at end of file Index: openacs-4/packages/lars-blogger/www/doc/index.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/doc/index.html,v diff -u -r1.1.2.5 -r1.1.2.6 --- openacs-4/packages/lars-blogger/www/doc/index.html 11 May 2003 22:51:46 -0000 1.1.2.5 +++ openacs-4/packages/lars-blogger/www/doc/index.html 13 Jun 2003 09:15:02 -0000 1.1.2.6 @@ -1,20 +1,20 @@ -Lars Pind's Blogger Documentation +Weblogger Documentation -

Lars Pind's Blogger Documentation

-By Lars Pind +

Weblogger Documentation

+By Lars Pind and Simon Carstensen
-

Why

+

Download

@@ -27,8 +27,8 @@

Install the package on your system, mount a new instance somewhere - on the site map, make sure you have admin permission on the - instance, and then visit /admin under the URL where you mounted + on the site map, make sure you have write permission on the + instance, and then visit the URL where you mounted it. Now you can add your first blog entry.

@@ -88,18 +88,21 @@

Technical Info

- The package fully supports multiple instances, i.e., you can mount + The package fully supports multiple instances. You can mount several instances in your site map, and they'll stay properly isolated - from each other. + from each other. Alternatively you can let multiple users post to one + instance by granting write permissions. Mounting Weblogger under, say, + /blog, you will have /blog/user/screenname displaying the entries of one + user and /blog displaying either a list of all bloggers (this is done by + setting the parameter DisplayUsersP to 1) or all entries posted to the + instance (the default).

Contents in your blog entries are assumed to be full-blooded - ADP-ified HTML, so don't give people access to post a blog unless - you trust them. I guess it should be made configurable whether to - allow this or not, but since I'm developing this for my own site - primarily, I haven't done so. This also means that if you've added - custom ADP tags, those are also available to you in your blog. + ADP-ified HTML, so don't give people access to post a blog (i.e. grant + write permissions on the instance) unless you trust them. This also means + that if you've added custom ADP tags, those are also available to you in your blog.

weblogs.com update ping

@@ -124,7 +127,7 @@

Then you'll need to set the parameters and say that your - rss_file_url is at + rss_file_name is at /where-your-blogger-instnace-sists/rss/rss.xml. If you leave this blank, we won't advertise your RSS feed URL anywhere.

@@ -137,35 +140,36 @@

Road Map

    +
  • Categorize and full-text-search-index blog entries so the archives + are more useful.
  • - Categorize and full-text-search-index blog entries so the archives - are more useful. -
    • -
  • Use content repository.
    • +
  • Ability to modify templates for each instance individually through + the UI.
    • +
  • Support for Trackback
    • +
  • Support for the Blogger and MetaWeblog APIs
    • +
  • WYISIYG editor
    • +
  • Improved RSS feed
    • +
  • Improved Configuration Settings.
    • +
  • Make it safe to use in a not-so-protected environment, e.g., + disable <% ... %> ADP notation.
    • +
  • Better documentation.
  • - Community-maintained blog ... everybody with 'write' can post entries. -
    • -
  • Moderation-feature: Entries posted by non-admins must go through a workflow-administered approval process.
  • - Ability to modify templates for each instance individually through - the UI (see this thread) -
    • -
  • Nicer interface (MovableType)
    • -
  • - More thorough documentation and some setup/config pages. -

Version History

    +
  • + 0.9 Added support for multiple users. (June 10, 2003) +
  • 0.8.7 Fixed notifications to include the title_url, and to not have extra spaces in the month name. (May 11, 2003) Index: openacs-4/packages/lars-blogger/www/rss/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/rss/index.vuh,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/www/rss/index.vuh 18 Oct 2002 20:21:06 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/www/rss/index.vuh 13 Jun 2003 09:15:02 -0000 1.1.2.2 @@ -1 +1,12 @@ -ns_returnfile 200 text/xml [rss_gen_report_file -summary_context_id [ad_conn package_id] -impl_name pinds_blog_entries] +set extra_url_list [split [ad_conn extra_url] "/"] + +set package_id [ad_conn package_id] + +set sql "select channel_id as summary_context_id + from weblogger_channels w + where w.package_id = :package_id + and w.user_id = '0'" + +set summary_context_id [db_string package_id $sql] + +ns_returnfile 200 text/xml [rss_gen_report_file -summary_context_id $summary_context_id -impl_name pinds_blog_entries] Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/user/index.vuh'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/user/archive/index.vuh'. Fisheye: No comparison available. Pass `N' to diff?