Index: openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl,v diff -u -r1.20.2.2 -r1.20.2.3 --- openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl 30 Dec 2019 17:30:00 -0000 1.20.2.2 +++ openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl 30 Dec 2019 17:31:03 -0000 1.20.2.3 @@ -21,7 +21,7 @@ set date [ns_queryget date] if {$date eq ""} { set date [dt_sysdate] -} +} array set message_key_array { list #acs-datetime.List# @@ -68,7 +68,7 @@ and ci.item_id != :including_item_id \ and ci.publish_status <> 'production' " -xo::dc foreach entries_this_month "select count(ci.item_id) as c, +xo::dc foreach entries_this_month "select count(ci.item_id) as c, [::xo::dc date_trunc day p.publish_date] as d \ $innersql and [::xo::dc date_trunc_expression month p.publish_date :date_reference] \ @@ -80,7 +80,7 @@ # The following time range specifies the dates between the navigation # arrows of the weblog mini calendar should be. Without a limitation, # crawler will iterate over this pages until they reach infinite past -# or infinite future. +# or infinite future. # #set earliest_date "2006-01-1" #set latest_date "1 year" @@ -124,14 +124,14 @@ } set today_p f set active_p t - + if {$julian_date < $first_julian_date_of_month} { set active_p f } elseif {$julian_date > $last_julian_date_in_month} { set active_p f - } + } set ansi_date [dt_julian_to_ansi $julian_date] - + if {$julian_date == $first_julian_date_of_month} { set day_number 1 } elseif {$julian_date == $last_julian_date_in_month +1} { @@ -141,22 +141,22 @@ if {$julian_date == $julian_date_today} { set today_p t } - + if { $day_of_week == 1} { set beginning_of_week_p t } else { set beginning_of_week_p f } - + if { $day_of_week == 7 } { set day_of_week 0 set end_of_week_p t } else { set end_of_week_p f } # ns_log notice "--D julian_date = $julian_date [dt_julian_to_ansi $julian_date] //$ansi_date" - set count [expr {[info exists entries($ansi_date)] ? - ($noparens ? "$entries($ansi_date)" : "($entries($ansi_date))") + set count [expr {[info exists entries($ansi_date)] ? + ($noparens ? "$entries($ansi_date)" : "($entries($ansi_date))") : ""}] if {$today_p} { set class today @@ -166,7 +166,7 @@ set class inactive } set url [export_vars -base $base_url {{date $ansi_date} summary}] - + set id minicalendar-$ansi_date if {$count ne ""} { append js [subst { @@ -177,7 +177,7 @@ }); }] } - + multirow append days $day_number $beginning_of_week_p $end_of_week_p $today_p $active_p \ $url $id $count $class incr day_number