[interchange-cvs] interchange - edl modified 4 files

[interchange-cvs at icdevgroup.org]

User:      edl
Date:      2003-12-04 18:43:19 GMT
Modified:  dist/foundation/pages/query check_orders.html
Modified:           order_detail.html order_return.html
Modified:  dist/foundation/pages returns.html
Log:
Added table= parameter to [query ...] tags. This fixes a rare problem that
only occurs when using multiple external db's in one catalog, and [query]'ing
a table in a different db than products.

Revision  Changes    Path
2.3       +3 -1      interchange/dist/foundation/pages/query/check_orders.html


rev 2.3, prev_rev 2.2
Index: check_orders.html
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/pages/query/check_orders.html,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- check_orders.html	14 Feb 2003 12:26:01 -0000	2.2
+++ check_orders.html	4 Dec 2003 18:43:19 -0000	2.3
@@ -39,7 +39,9 @@
     [index table=orderline export-only=1]
 [/if]
 
-[query arrayref=orders
+[query 
+table=transactions
+arrayref=orders
 	sql="SELECT
 		code,status,tracking_number,nitems,subtotal,shipping,handling,total_cost,payment_method,order_date
 		FROM transactions



2.3       +1 -0      interchange/dist/foundation/pages/query/order_detail.html


rev 2.3, prev_rev 2.2
Index: order_detail.html
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/pages/query/order_detail.html,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- order_detail.html	21 Nov 2003 22:45:06 -0000	2.2
+++ order_detail.html	4 Dec 2003 18:43:19 -0000	2.3
@@ -98,6 +98,7 @@
 [query
 	list=1
 	st=db
+	table=orderline
 	sql=|
 		SELECT * FROM orderline
 		WHERE order_number = '[scratch arg]'



2.4       +1 -0      interchange/dist/foundation/pages/query/order_return.html


rev 2.4, prev_rev 2.3
Index: order_return.html
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/pages/query/order_return.html,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- order_return.html	22 Nov 2003 00:55:17 -0000	2.3
+++ order_return.html	4 Dec 2003 18:43:19 -0000	2.4
@@ -99,6 +99,7 @@
 [query
 	list=1
 	st=db
+	table=orderline
 	sql=|
 		SELECT * FROM orderline
 		WHERE order_number = '[scratch arg]'



2.3       +4 -1      interchange/dist/foundation/pages/returns.html


rev 2.3, prev_rev 2.2
Index: returns.html
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/pages/returns.html,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- returns.html	14 Feb 2003 12:26:01 -0000	2.2
+++ returns.html	4 Dec 2003 18:43:19 -0000	2.3
@@ -24,7 +24,10 @@
 
 <br>
 
-[query st=db arrayref=orders
+[query 
+st=db 
+arrayref=orders
+table=transactions
 		sql="SELECT
 			code,status,nitems,subtotal,shipping,handling,total_cost,payment_method,order_date
 			FROM transactions