Index: openacs-4/packages/ecommerce/www/admin/orders/shipments-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/shipments-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/shipments-oracle.xql	10 Jul 2001 20:33:53 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/shipments-oracle.xql	22 Jul 2001 07:04:48 -0000	1.2
@@ -1,20 +1,27 @@
 <?xml version="1.0"?>
-
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
+<fullquery name="get_carrier_list">      
+      <querytext>
+      select unique carrier from ec_shipments where carrier is not null order by carrier
+      </querytext>
+</fullquery>
+
+ 
 <fullquery name="shipments_select">      
       <querytext>
       
-select s.shipment_id, 
-       s.shipment_date, 
-       s.order_id, 
-       s.carrier, 
-       case when nvl((select count(*) from ec_items where order_id=s.order_id) = 0) then nvl((select count(*) from ec_items where shipment_id=s.shipment_id) else 0 end,'Full','Partial') as full_or_partial,
+select s.shipment_id,
+       s.shipment_date,
+       s.order_id,
+       s.carrier,
+       decode(nvl((select count(*) from ec_items where order_id=s.order_id),0),nvl((select count(*) from ec_items where shipment_id=s.shipment_id),0),'Full','Partial') as full_or_partial,
        nvl((select count(*) from ec_items where shipment_id=s.shipment_id),0) as n_items
 from ec_shipments s
 $where_clause
 order by $order_by_clause
+
       </querytext>
 </fullquery>