Index: openacs-4/packages/acs-tcl/tcl/aolserver-3-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/aolserver-3-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-tcl/tcl/aolserver-3-procs.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-tcl/tcl/aolserver-3-procs.tcl 24 Apr 2001 22:38:12 -0000 1.2 @@ -123,29 +123,6 @@ } } -ad_proc -deprecated ns_findrowbyid {table rowidset} { - db_with_handle db { - set sql "select * from [ns_dbquotename $table] where" - for {set i 0} {$i < [ns_set size $rowidset]} {incr i} { - if {$i != 0} { - append sql " and" - } - set column [ns_urldecode [ns_set key $rowidset $i]] - set value [ns_set value $rowidset $i] - set type [ns_column type $db $table $column] - append sql " [ns_dbquotename $column] = [ns_dbquotevalue $value $type]" - } - - if [catch { - set row [ns_ora select $db $sql] - } errMsg] { - ns_db setexception $db NSINT "Could not find row" - error $errMsg - } - } - return $row -} - proc _http_read {timeout sock length} { return [_ns_http_read $timeout $sock $length] Index: openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.4 +++ openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql 24 Apr 2001 22:38:12 -0000 1.5 @@ -43,20 +43,6 @@ - - - - - select v.package_id, p.parameter_name, - coalesce(p.default_value, v.attr_value) as attr_value - from apm_parameters p left outer join apm_parameter_values v - using (parameter_id) - where p.package_key = :package_key - - - - - Index: openacs-4/packages/acs-tcl/tcl/apm-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-tcl/tcl/apm-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.xql 24 Apr 2001 22:38:12 -0000 1.2 @@ -31,7 +31,18 @@ - + + + + select v.package_id, p.parameter_name, + coalesce(p.default_value, v.attr_value) as attr_value + from apm_parameters p left outer join apm_parameter_values v + using (parameter_id) + where p.package_key = :package_key + + + + Index: openacs-4/packages/acs-tcl/tcl/navigation-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/navigation-procs-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-tcl/tcl/navigation-procs-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.2 +++ openacs-4/packages/acs-tcl/tcl/navigation-procs-postgresql.xql 24 Apr 2001 22:38:12 -0000 1.3 @@ -4,14 +4,12 @@ - select site_node__url(node_id) as url, object_id, - acs_object__name(object_id) as object_name, + select site_node__url(n2.node_id) as url, n2.object_id, + acs_object__name(n2.object_id) as object_name, tree_level(n2.tree_sortkey) as level - from site_nodes n1, site_nodes n2 - where n1.tree_sortkey = (select tree_sortkey - from site_nodes - where node_id = :node_id) - and n2.tree_sortkey <= n1.tree_sortkey + from (select * from site_nodes where node_id = :node_id) n1, + site_nodes n2 + where n2.tree_sortkey <= n1.tree_sortkey and n1.tree_sortkey like (n2.tree_sortkey || '%') order by level desc Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.3 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql 24 Apr 2001 22:38:12 -0000 1.4 @@ -6,7 +6,7 @@ - select site_node.url(n.node_id) as url, n.node_id, n.directory_p, + select site_node__url(n.node_id) as url, n.node_id, n.directory_p, n.pattern_p, n.object_id, o.object_type, n.package_key, n.package_id from acs_objects o left outer join (select n.node_id, n.directory_p, n.pattern_p, n.object_id, Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql 24 Apr 2001 22:38:12 -0000 1.2 @@ -1,6 +1,22 @@ + + + + select site_node__url(n.node_id) as url, n.node_id, n.directory_p, + n.pattern_p, n.object_id, o.object_type, n.package_key, n.package_id + from acs_objects o left outer join + (select n.node_id, n.directory_p, n.pattern_p, n.object_id, + p.package_key, p.package_id + from site_nodes n, apm_packages p + where n.object_id = p.package_id) n + using (object_id) + + + + + Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff?