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 -N -r1.15 -r1.15.2.1
--- openacs-4/packages/lars-blogger/www/index.tcl 21 Oct 2003 20:31:07 -0000 1.15
+++ openacs-4/packages/lars-blogger/www/index.tcl 17 Nov 2003 14:47:43 -0000 1.15.2.1
@@ -90,34 +90,38 @@
set header_background_color [lars_blog_header_background_color]
if { [exists_and_not_null year] } {
- if { ![exists_and_not_null month] } {
- ad_return_complaint 1 "
You must specify both year and month."
- ad_script_abort
- }
- # Show Archive, Year and Month i context
- append context_base_url /archive
+ # Show Year and Month in context
+ append context_base_url archive/
lappend context [list $context_base_url Archive]
+
append context_base_url /$year
lappend context [list $context_base_url $year]
- append context_base_url /$month
- lappend context [list $context_base_url $month]
-
if { [exists_and_not_null day] } {
set interval "day"
db_1row archive_date_month_day {}
- # Day in context
+ # Month and day in context
+ append context_base_url /$month
+ lappend context [list $context_base_url $month]
append context_base_url /$day
lappend context [list $context_base_url $day]
- } else {
+
+ } elseif { [exists_and_not_null month] } {
set interval "month"
db_1row archive_date_month {}
+
+ # Month in context
+ append context_base_url /$month
+ lappend context [list $context_base_url $month]
+ } else {
+ set interval "year"
+ db_1row archive_date_year {}
}
append page_title " Archive"
- set date "$year-$month-[ad_decode $day "" "01" $day]"
+ set date "$year-[ad_decode $month "" "01" $month]-[ad_decode $day "" "01" $day]"
set type "archive"
} else {
Index: openacs-4/packages/lars-blogger/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.vuh,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/lars-blogger/www/index.vuh 29 Sep 2003 08:05:42 -0000 1.1
+++ openacs-4/packages/lars-blogger/www/index.vuh 17 Nov 2003 14:47:43 -0000 1.1.2.1
@@ -14,8 +14,6 @@
and w.package_id = :package_id"
set summary_context_id [db_string select_user_id $sql]
-
- ns_log "Notice" "SUM: $summary_context_id"
ns_returnfile 200 text/xml [rss_gen_report_file -summary_context_id $summary_context_id -impl_name pinds_blog_entries]
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 -N -r1.4 -r1.4.2.1
--- openacs-4/packages/lars-blogger/www/index.xql 29 Sep 2003 08:05:42 -0000 1.4
+++ openacs-4/packages/lars-blogger/www/index.xql 17 Nov 2003 14:47:43 -0000 1.4.2.1
@@ -2,6 +2,16 @@
+
+
+ select to_date(:year, 'YYYY')
+ as archive_date,
+ to_char(to_date(:year, 'YYYY'), 'YYYY')
+ as archive_date_pretty
+ from dual
+
+
+
select to_date(:year || :month, 'YYYYMM')