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.49.2.3 -r1.49.2.4 --- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 28 Oct 2020 15:39:19 -0000 1.49.2.3 +++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 14 Feb 2021 21:08:02 -0000 1.49.2.4 @@ -6,13 +6,13 @@ # The Query Dispatcher is documented at http://openacs.org/ # The Query Dispatcher needs tDOM (http://tdom.org) to work. -# This doesn't use the ad_proc construct, or any significant aD constructs, -# because we want this piece to be usable in a separate context. While this makes -# the coding somewhat more complicated, it's still easy to document and write clear, -# virgin Tcl code. +# This doesn't use the ad_proc construct, or any significant aD +# constructs, because we want this piece to be usable in a separate +# context. While this makes the coding somewhat more complicated, it +# is still easy to document and write clear, virgin Tcl code. +# - # The following code allows ad_proc to be used # here (a local workalike is declared if absent). # added 2002-09-11 Jeff Davis (davis@xarg.net) @@ -592,7 +592,7 @@ Store in Cache. The load_location is the file where this query was found. } { - # Check if it's compatible at all! + # Check if it is compatible at all! set rdbms [db_fullquery_get_rdbms $fullquery] if {![db_rdbms_compatible_p $rdbms [db_current_rdbms]]} { # The query isn't compatible, probably because of a too high version @@ -678,7 +678,7 @@ # Get the list of queries out set root_node [xml_doc_get_first_node $parsed_doc] - # Check that it's a queryset + # Check if the node is a queryset if {[xml_node_get_name $root_node] ne "queryset"} { # db_qd_log Error "OH OH, error, first node is [xml_node_get_name $root_node] and not 'queryset'" return "" @@ -768,8 +768,10 @@ ad_proc -private db_rdbms_parse_from_xml_node {rdbms_node} { Parse and RDBMS struct from an XML fragment node -} { - # Check that it's RDBMS +} { + # + # Check if the DOM node refers to a RDBMS. + # if {[xml_node_get_name $rdbms_node] ne "rdbms"} { db_qd_log Debug "db_rdbms_parse_from_xml_node: PARSER = BAD RDBMS NODE!" return {}