Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 17 Jun 2003 01:04:46 -0000 1.15 +++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 29 Jun 2003 23:32:23 -0000 1.16 @@ -115,8 +115,10 @@ # Parse the xml document set tree [xml_parse -persist $catalog_file_contents] +ns_log notice "Huh? tree: $tree" # Get the message catalog root node set root_node [xml_doc_get_first_node $tree] +ns_log notice "Huh? root_node: $root_node name: [xml_node_get_name $root_node]" if { ![string equal [xml_node_get_name $root_node] ${MESSAGE_CATALOG_TAG}] } { error "lang::catalog_parse: Could not find root node ${MESSAGE_CATALOG_TAG}" } Index: openacs-4/packages/acs-lang/www/admin/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/master.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-lang/www/admin/master.adp 22 May 2003 14:05:12 -0000 1.4 +++ openacs-4/packages/acs-lang/www/admin/master.adp 29 Jun 2003 23:32:23 -0000 1.5 @@ -1,6 +1,6 @@ - @title;noquote@ - @header_stuff;noquote@ -

@context_bar@

+ @title;noquote@ + @header_stuff;noquote@ +

@context_bar;noquote@

Index: openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl 17 May 2003 09:56:45 -0000 1.12 +++ openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl 29 Jun 2003 23:32:23 -0000 1.13 @@ -265,6 +265,7 @@ # MAYBE NOT, THE SEMANTICS MIGHT REQUIRE TO CALL # THE FUNCTION ONLY IF THE IMPLEMENTATION IS SUPPORTED. ns_log warning "ACS-SC: Function Not Found: $proc_name [info procs $proc_name]" +ns_log Notice "Huh? $contract $impl $operation" return } } @@ -282,4 +283,4 @@ } else { # ns_log Debug "$msg" } -} \ No newline at end of file +} Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v diff -u -r1.35 -r1.36 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 17 May 2003 10:04:18 -0000 1.35 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 29 Jun 2003 23:32:23 -0000 1.36 @@ -474,10 +474,10 @@ if { ![empty_string_p $root] } { if { [regexp "^${root}(.*)$" $url match url] } { - if [regexp {^GET [^\?]*\?(.*) HTTP} [ns_conn request] match vars] { + if { [regexp {^GET [^\?]*\?(.*) HTTP} [ns_conn request] match vars] } { append url ?$vars } - if {[ad_secure_conn_p]} { + if { [ad_secure_conn_p] } { # it's a secure connection. ad_returnredirect https://[ad_host][ad_port]$url return "filter_return" @@ -533,17 +533,11 @@ rp_debug -ns_log_level debug -debug t "rp_filter: setting up request: [ns_conn method] [ns_conn url] [ns_conn query]" - global tcl_site_nodes - if [catch { - if [catch { array set node $tcl_site_nodes([ad_conn url]) }] { - array set node [site_node [ad_conn url]] - set tcl_site_nodes([ad_conn url]) [array get node] - } - } errmsg] { + if { [catch { array set node [site_node::get -url [ad_conn url]] } errmsg] } { # log and do nothing rp_debug "error within rp_filter [ns_conn method] [ns_conn url] [ns_conn query]. $errmsg" } else { - if {[string equal $node(url) "[ad_conn url]/"]} { + if { [string equal $node(url) "[ad_conn url]/"] } { ad_returnredirect $node(url) rp_debug "rp_filter: returnredirect $node(url)" rp_debug "rp_filter: return filter_return" @@ -568,7 +562,7 @@ # ##### - if ![rp_performance_mode] { + if { ![rp_performance_mode] } { # We wrap this in a catch, because we don't want an error here to # cause the request to fail. if { [catch { apm_load_any_changed_libraries } error] } { @@ -610,7 +604,8 @@ # Make sure the user is authorized to make this request. # ##### - if { ![empty_string_p [ad_conn object_id]]} { + + if { ![empty_string_p [ad_conn object_id]] } { ad_try { if {[string match "admin/*" [ad_conn extra_url]]} { permission::require_permission -object_id [ad_conn object_id] -privilege admin @@ -740,19 +735,19 @@ set startclicks [clock clicks] rp_debug "rp_handler: handling request: [ns_conn method] [ns_conn url]?[ns_conn query]" - if [set code [catch { - if [rp_performance_mode] { + if { [set code [catch { + if { [rp_performance_mode] } { global tcl_url2file tcl_url2path_info - if ![catch { + if { ![catch { set file $tcl_url2file([ad_conn url]) set path_info $tcl_url2path_info([ad_conn url]) - } errmsg] { + } errmsg] } { ad_conn -set file $file ad_conn -set path_info $path_info rp_serve_concrete_file $file return } - rp_debug "cache miss in rp_handler: $errmsg" + rp_debug -debug t "error in rp_handler: $errmsg" } set paths [list] @@ -819,7 +814,9 @@ # Now visit the candidates columnwise: from most specific to least foreach cand0 [lindex $candidates 0] cand1 [lindex $candidates 1] { foreach candidate [list $cand0 $cand1] { - if [empty_string_p $candidate] continue; + if { [empty_string_p $candidate] } { + continue + } set root [lindex $candidate 0]; # fewer instructions than util_unlist set path [lindex $candidate 1] set prefix [lindex $candidate 2] @@ -847,7 +844,7 @@ ad_call_proc_if_exists ds_add rp [list transformation [list notfound $root/$path notfound] $startclicks [clock clicks]] ns_returnnotfound - } errmsg]] { + } errmsg]] } { if {$code == 1} { if {![string equal [ns_conn query] ""]} { set q ? @@ -1050,9 +1047,20 @@ Returns a property about the connection. See the request - processor documentation for a list of allowable values. If -set - is passed then it sets a property. + processor documentation for an (almost complete) list of allowable values. +

+ + If -set is passed then it sets a property. + +

+ + If the property has not been set directly by OpenACS it will be passed on to aolservers ns_conn: http://www.aolserver.com/docs/devel/tcl/api/conn.html#ns_conn. If it is not a valid option for ns_conn either then it will throw an error. + +

+ + Added recursion_count to properly deal with internalredirects. + added recursion_count to properly deal with internalredirects. } { global ad_conn Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v diff -u -r1.28 -r1.29 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 19 May 2003 14:23:48 -0000 1.28 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 29 Jun 2003 23:32:23 -0000 1.29 @@ -133,12 +133,6 @@ nsv_set site_node_urls $node(node_id) $node(url) } - ns_eval { - global tcl_site_nodes - if {[info exists tcl_site_nodes]} { - unset tcl_site_nodes - } - } } ad_proc -private update_cache { @@ -148,12 +142,6 @@ nsv_set site_nodes $node(url) [array get node] nsv_set site_node_urls $node(node_id) $node(url) - ns_eval { - global tcl_site_nodes - if { [info exists tcl_site_nodes] } { - array unset tcl_site_nodes "${node(url)}*" - } - } } else { set url [get_url -node_id $node_id] Index: openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs-oracle.xql,v diff -u -r1.13 -r1.14 --- openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql 4 Dec 2002 09:44:35 -0000 1.13 +++ openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql 29 Jun 2003 23:32:24 -0000 1.14 @@ -35,6 +35,17 @@ + + + select to_char(to_date(:current_date, 'yyyy-mm-dd'), 'D') + as day_of_the_week, + to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'SUNDAY')) + as sunday_of_the_week, + to_char(next_day(to_date(:current_date, 'yyyy-mm-dd'), 'Saturday')) + as saturday_of_the_week + from dual + + Index: openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs-postgresql.xql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql 26 May 2003 09:59:54 -0000 1.11 +++ openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql 29 Jun 2003 23:32:24 -0000 1.12 @@ -3,6 +3,38 @@ postgresql7.1 + + + + select to_char(start_date, 'J') as start_date, + to_char(start_date, 'HH:MIpm') as start_time, + to_char(end_date, 'HH:MIpm') as end_time, + coalesce(e.name, a.name) as name, + coalesce(e.description, a.description) as description, + coalesce(e.status_summary, a.status_summary) as status_summary, + e.event_id as item_id, + (select on_which_calendar from cal_items where cal_item_id = e.event_id) as calendar_id, + (select calendar_name from calendars + where calendar_id = (select on_which_calendar from cal_items where cal_item_id= e.event_id)) + as calendar_name + from acs_activities a, + acs_events e, + timespans s, + time_intervals t + where e.timespan_id = s.timespan_id + and s.interval_id = t.interval_id + and e.activity_id = a.activity_id + and e.event_id + in ( + select cal_item_id + from cal_items + where on_which_calendar in ([join $calendar_id_list ","]) + ) + order by start_date,end_date + + + + select to_char(start_date, 'J') as start_date_julian, @@ -39,32 +71,88 @@ - + + select to_char(to_date(:current_date, 'yyyy-mm-dd'), 'D') + as day_of_the_week, + to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')- '1 week'::interval, 'Sunday'), 'YYYY-MM-DD') + as sunday_of_the_week, + to_char(next_day(to_date(:current_date, 'yyyy-mm-dd'), 'Saturday'), 'YYYY-MM-DD') + as saturday_of_the_week + from dual + + + + + select to_char(start_date, 'HH24') as start_hour, to_char(start_date, 'HH:MIpm') as pretty_start_date, to_char(end_date, 'HH:MIpm') as pretty_end_date, + to_char(start_date, 'HH24:MI') as start_date, + to_char(end_date, 'HH24:MI') as end_date, coalesce(e.name, a.name) as name, coalesce(e.status_summary, a.status_summary) as status_summary, - e.event_id as item_id + e.event_id as item_id, + (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type, + on_which_calendar as calendar_id, + (select calendar_name from calendars + where calendar_id = on_which_calendar) + as calendar_name from acs_activities a, acs_events e, timespans s, - time_intervals t + time_intervals t, + cal_items where e.timespan_id = s.timespan_id and s.interval_id = t.interval_id and e.activity_id = a.activity_id and start_date between to_date(:current_date,:date_format) and to_date(:current_date,:date_format) + cast('23 hours 59 minutes 59 seconds' as interval) +and cal_items.cal_item_id= e.event_id and e.event_id in ( select cal_item_id from cal_items + where on_which_calendar in ([join $calendar_id_list ","]) + ) + + + + + + + select to_char(start_date, 'HH24') as start_hour, + to_char(start_date, 'MM/DD/YYYY') as pretty_date, + to_char(start_date, 'Day') as pretty_weekday, + to_char(start_date, 'HH:MIpm') as pretty_start_date, + to_char(end_date, 'HH:MIpm') as pretty_end_date, + coalesce(e.name, a.name) as name, + coalesce(e.status_summary, a.status_summary) as status_summary, + e.event_id as item_id, + recurrence_id, + (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type +from acs_activities a, + acs_events e, + timespans s, + time_intervals t, + cal_items +where e.timespan_id = s.timespan_id +and s.interval_id = t.interval_id +and e.activity_id = a.activity_id +and cal_items.cal_item_id= e.event_id +and (start_date > to_date(:start_date,:date_format) or :start_date is null) and + (start_date < to_date(:end_date,:date_format) or :end_date is null) +and e.event_id +in ( + select cal_item_id + from cal_items where on_which_calendar = :calendar_id ) +order by $sort_by +