Index: openacs-4/packages/ecommerce/www/admin/orders/search-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/search-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/search-oracle.xql	23 Jul 2001 06:38:24 -0000	1.1
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="order_id_query_string_sql">      
+      <querytext>
+      
+    select o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id) as price_to_display,
+           o.user_id,
+           u.first_names, u.last_name,
+           count(*) as n_items
+      from ec_orders o, cc_users u, ec_items i
+     where o.order_id like :order_id_query_string
+       and o.user_id=u.user_id(+)
+       and o.order_id=i.order_id
+  group by o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id), o.user_id,
+           u.first_names, u.last_name
+  order by order_id
+  
+      </querytext>
+</fullquery>
+
+
+<fullquery name="product_name_query_string_sql">
+      <querytext>
+
+    select o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id) as price_to_display,
+           o.user_id,
+           u.first_names, u.last_name,
+           p.product_name,
+           count(*) as n_items
+      from ec_orders o, cc_users u, ec_items i, ec_products p
+     where upper(p.product_name) like upper(:product_name_query_string)
+       and i.product_id=p.product_id
+       and o.user_id=u.user_id(+)
+       and o.order_id=i.order_id
+  group by o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id),
+           o.user_id,
+           u.first_names, u.last_name, p.product_name
+  order by order_id
+
+      </querytext>
+</fullquery>
+
+
+<fullquery name="default_sql">
+      <querytext>
+
+    select o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id) as price_to_display,
+           o.user_id,
+           u.first_names, u.last_name,
+           count(*) as n_items
+      from ec_orders o, cc_users u, ec_items i
+     where upper(u.last_name) like upper(:cust_last_name_query_string)
+       and o.user_id=u.user_id(+)
+       and o.order_id=i.order_id
+  group by o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id),
+           o.user_id,
+           u.first_names, u.last_name
+  order by order_id
+
+      </querytext>
+</fullquery>
+
+
+ 
+</queryset>
Index: openacs-4/packages/ecommerce/www/admin/orders/search-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/search-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/search-postgresql.xql	23 Jul 2001 06:38:24 -0000	1.1
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="order_id_query_string_sql">      
+      <querytext>
+      
+    select o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id) as price_to_display,
+           o.user_id,
+           u.first_names, u.last_name,
+           count(*) as n_items
+      from ec_orders o
+           LEFT JOIN cc_users u on (o.user_id=u.user_id)
+           JOIN ec_items i on (o.order_id=i.order_id)
+     where o.order_id like :order_id_query_string
+  group by o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id), o.user_id,
+           u.first_names, u.last_name
+  order by order_id
+  
+      </querytext>
+</fullquery>
+
+
+<fullquery name="product_name_query_string_sql">
+      <querytext>
+
+    select o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id) as price_to_display,
+           o.user_id,
+           u.first_names, u.last_name,
+           p.product_name,
+           count(*) as n_items
+      from ec_orders o
+           JOIN ec_items i on (o.order_id=i.order_id)
+           JOIN ec_products p on (i.product_id=p.product_id)
+           LEFT JOIN cc_users u on (o.user_id=u.user_id)
+     where upper(p.product_name) like upper(:product_name_query_string)
+  group by o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id),
+           o.user_id,
+           u.first_names, u.last_name, p.product_name
+  order by order_id
+
+      </querytext>
+</fullquery>
+
+
+<fullquery name="default_sql">
+      <querytext>
+
+    select o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id) as price_to_display,
+           o.user_id,
+           u.first_names, u.last_name,
+           count(*) as n_items
+      from ec_orders o
+           LEFT JOIN cc_users u on (o.user_id=u.user_id)
+	   JOIN ec_items i on (o.order_id=i.order_id)
+     where upper(u.last_name) like upper(:cust_last_name_query_string)
+  group by o.order_id, o.confirmed_date, o.order_state,
+           ec_total_price(o.order_id),
+           o.user_id,
+           u.first_names, u.last_name
+  order by order_id
+
+      </querytext>
+</fullquery>
+
+
+ 
+</queryset>
Index: openacs-4/packages/ecommerce/www/admin/orders/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/search.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/search.tcl	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/search.tcl	23 Jul 2001 06:38:24 -0000	1.2
@@ -30,43 +30,41 @@
     set product_name ""
     # append order_id_query_string "%"
     set order_id_query_string "%$order_id_query_string%"
-    set query "
-    select o.order_id, o.confirmed_date, o.order_state,
-           ec_total_price(o.order_id) as price_to_display,
-           o.user_id,
-           u.first_names, u.last_name,
-           count(*) as n_items
-      from ec_orders o, cc_users u, ec_items i
-     where o.order_id like :order_id_query_string
-       and o.user_id=u.user_id(+)
-       and o.order_id=i.order_id
-  group by o.order_id, o.confirmed_date, o.order_state,
-           ec_total_price(o.order_id), o.user_id,
-           u.first_names, u.last_name
-  order by order_id
-"
+    set query [db_map order_id_query_string_sql]
+#    select o.order_id, o.confirmed_date, o.order_state,
+#           ec_total_price(o.order_id) as price_to_display,
+#           o.user_id,
+#           u.first_names, u.last_name,
+#           count(*) as n_items
+#      from ec_orders o, cc_users u, ec_items i
+#     where o.order_id like :order_id_query_string
+#       and o.user_id=u.user_id(+)
+#       and o.order_id=i.order_id
+#  group by o.order_id, o.confirmed_date, o.order_state,
+#           ec_total_price(o.order_id), o.user_id,
+#           u.first_names, u.last_name
+#  order by order_id
 } elseif { [info exists product_name_query_string] } {
     set product_header "<td><b>Product</b></td>"
     # append product_name_query_string "%"
     set product_name_query_string "%$product_name_query_string%"
-    set query "
-    select o.order_id, o.confirmed_date, o.order_state,
-           ec_total_price(o.order_id) as price_to_display,
-           o.user_id,
-           u.first_names, u.last_name,
-           p.product_name,
-           count(*) as n_items
-      from ec_orders o, cc_users u, ec_items i, ec_products p
-     where upper(p.product_name) like upper(:product_name_query_string)
-       and i.product_id=p.product_id
-       and o.user_id=u.user_id(+)
-       and o.order_id=i.order_id
-  group by o.order_id, o.confirmed_date, o.order_state,
-           ec_total_price(o.order_id),
-           o.user_id,
-           u.first_names, u.last_name, p.product_name
-  order by order_id
-"
+    set query [db_map product_name_query_string_sql]
+#    select o.order_id, o.confirmed_date, o.order_state,
+#           ec_total_price(o.order_id) as price_to_display,
+#           o.user_id,
+#           u.first_names, u.last_name,
+#           p.product_name,
+#           count(*) as n_items
+#      from ec_orders o, cc_users u, ec_items i, ec_products p
+#     where upper(p.product_name) like upper(:product_name_query_string)
+#       and i.product_id=p.product_id
+#       and o.user_id=u.user_id(+)
+#       and o.order_id=i.order_id
+#  group by o.order_id, o.confirmed_date, o.order_state,
+#           ec_total_price(o.order_id),
+#           o.user_id,
+#           u.first_names, u.last_name, p.product_name
+#  order by order_id
 } elseif { [info exists customer_last_name_query_string] } {
     set product_header ""
     set product_name ""
@@ -75,22 +73,21 @@
     # This is because customer_last_name_query_string is too long to
     # be a bind variable
     set cust_last_name_query_string $customer_last_name_query_string
-    set query "
-    select o.order_id, o.confirmed_date, o.order_state,
-           ec_total_price(o.order_id) as price_to_display,
-           o.user_id,
-           u.first_names, u.last_name,
-           count(*) as n_items
-      from ec_orders o, cc_users u, ec_items i
-     where upper(u.last_name) like upper(:cust_last_name_query_string)
-       and o.user_id=u.user_id(+)
-       and o.order_id=i.order_id
-  group by o.order_id, o.confirmed_date, o.order_state,
-           ec_total_price(o.order_id),
-           o.user_id,
-           u.first_names, u.last_name
-  order by order_id
-"
+    set query [db_map default_sql]
+#    select o.order_id, o.confirmed_date, o.order_state,
+#           ec_total_price(o.order_id) as price_to_display,
+#           o.user_id,
+#           u.first_names, u.last_name,
+#           count(*) as n_items
+#      from ec_orders o, cc_users u, ec_items i
+#     where upper(u.last_name) like upper(:cust_last_name_query_string)
+#       and o.user_id=u.user_id(+)
+#       and o.order_id=i.order_id
+#  group by o.order_id, o.confirmed_date, o.order_state,
+#           ec_total_price(o.order_id),
+#           o.user_id,
+#           u.first_names, u.last_name
+#  order by order_id
 
 }
 
@@ -121,6 +118,8 @@
 
     if {![string equal "" $product_name]} {
         set product_column "<td>$product_name</td>"
+    } else {
+	set product_column ""
     }
 
     doc_body_append "<tr bgcolor=$bgcolor>