Index: openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 23 Apr 2001 19:43:04 -0000 1.5
+++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 26 Apr 2001 05:38:54 -0000 1.6
@@ -39,7 +39,7 @@
ns_log Notice "QD/COMPATIBILITY = The RDBMS_PATTERN is [db_rdbms_get_type $rdbms_pattern] - [db_rdbms_get_version $rdbms_pattern]"
# If the pattern is for all RDBMS, then yeah, compatible
- if {[empty_string_p [db_rdbms_get_type $rdbms_pattern]]} {
+ if {[empty_string_p [db_rdbms_get_type $rdbms_test]]} {
return 1
}
@@ -406,7 +406,7 @@
set name [db_fullquery_get_name $fullquery]
- ns_log Notice "QD = Query $name is compatible!"
+ ns_log Notice "QD = Query $name is compatible! fullquery = $fullquery, name = $name"
# If we already have a query for that name, we need to
# figure out which one is *most* compatible.
@@ -416,7 +416,6 @@
set fullquery [db_qd_pick_most_specific_query [db_current_rdbms] $old_fullquery $fullquery]
}
-
nsv_set OACS_FULLQUERIES $name $fullquery
}
@@ -445,7 +444,8 @@
# remove the last chunk of the file name, since we're just looking for the root path
# NOTE: THIS MAY NEED BETTER ABSTRACTION, since this assumes a naming scheme
# of -rdbms.XXX (ben)
- regsub {\-[^/-]*$} $relative_path {} relative_path
+ regsub {\.xql} $relative_path {} relative_path
+ regsub {\-(postgresql|oracle)$} $relative_path {} relative_path
# Change all . to :
regsub -all {\.} $relative_path {:} relative_path
@@ -671,4 +671,4 @@
# ns_log Notice "QD=TEMP= new massaged file content: \n $new_file_content \n"
return $new_file_content
-}
\ No newline at end of file
+}
Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/acs-tcl.info 18 Apr 2001 02:00:59 -0000 1.8
+++ openacs-4/packages/acs-tcl/acs-tcl.info 26 Apr 2001 05:38:54 -0000 1.9
@@ -28,50 +28,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: openacs-4/packages/acs-tcl/tcl/admin-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/tcl/admin-procs.xql 24 Apr 2001 06:02:26 -0000 1.1
+++ openacs-4/packages/acs-tcl/tcl/admin-procs.xql 26 Apr 2001 05:38:54 -0000 1.2
@@ -1,14 +1,61 @@
-
+
select sql_post_select
- from user_classes where user_class_id = [ns_dbquotevalue $user_class_id]
+ from user_classes
+ where user_class_id = [ns_dbquotevalue $user_class_id]
+
+
+ select category from categories where category_id = :category_id
+
+
+
+
+
+
+
+ select country_name from country_codes where iso = :country_code
+
+
+
+
+
+
+
+ select state_name from states where usps_abbrev = :usps_abbrev
+
+
+
+
+
+
+
+ select group_name from groups where group_id = :group_id
+
+
+
+
+
+
+
+ select to_char(to_date(:registration_during_month,'YYYYMM'),'fmMonth YYYY') from dual
+
+
+
+
+
+
+
+ select name from user_classes where user_class_id = :user_class_id
+
+
+
Index: openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql 24 Apr 2001 06:02:26 -0000 1.1
+++ openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql 26 Apr 2001 05:38:54 -0000 1.2
@@ -53,7 +53,7 @@
- select v.package_id, p.parameter_name, nvl(p.default_value, v.attr_value) attr_value
+ select v.package_id, p.parameter_name, nvl(p.default_value, v.attr_value) as attr_value
from apm_parameters p, apm_parameter_values v
where p.package_key = :package_key
and p.parameter_id = v.parameter_id (+)
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 24 Apr 2001 06:02:27 -0000 1.9
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 26 Apr 2001 05:38:54 -0000 1.10
@@ -627,7 +627,7 @@
# Update the cache.
db_foreach apm_parameter_cache_update {
- select v.package_id, p.parameter_name, nvl(p.default_value, v.attr_value) attr_value
+ select v.package_id, p.parameter_name, nvl(p.default_value, v.attr_value) as attr_value
from apm_parameters p, apm_parameter_values v
where p.package_key = :package_key
and p.parameter_id = v.parameter_id (+)
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/tcl/security-init-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/tcl/security-init-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/acs-tcl/tcl/security-init.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-init.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-tcl/tcl/security-init.xql 26 Apr 2001 05:38:54 -0000 1.1
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+ select case when count(*) = 0 then 0 else 1 end from secret_tokens
+
+
+
+
+
+
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.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql 24 Apr 2001 22:38:12 -0000 1.4
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql 26 Apr 2001 05:38:54 -0000 1.5
@@ -2,22 +2,6 @@
postgresql7.1
-
-
-
-
- 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)
-
-
-
-
Index: openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/table-display-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl 24 Apr 2001 22:39:18 -0000 1.3
+++ openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl 26 Apr 2001 05:38:54 -0000 1.4
@@ -270,14 +270,13 @@
} {
+
+ set full_statement_name [db_qd_get_fullname $statement_name]
+
# This procedure needs a full rewrite!
db_with_handle Tdb {
# Execute the query
- if { ![empty_string_p $bind] } {
- set selection [ns_ora select $Tdb -bind $bind $sql_qry]
- } else {
- set selection [ns_ora select $Tdb $sql_qry]
- }
+ set selection [db_exec select $Tdb $full_statement_name $sql_qry]
set Tcount 0
set Tband_count 0
set Tpage_count 0