Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs-oracle.xql,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/ecommerce/tcl/ecommerce-procs-oracle.xql 23 Sep 2002 20:43:26 -0000 1.10 +++ openacs-4/packages/ecommerce/tcl/ecommerce-procs-oracle.xql 14 May 2003 19:52:45 -0000 1.10.2.1 @@ -40,6 +40,14 @@ + + + select category_id, subcategory_id, subsubcategory_id, product_id + from ($common_sql) as dummy + where rownum < 2 + + + select decode(sign(sysdate-available_date),1,1,null,1,0) as available_p, Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs-postgresql.xql,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/ecommerce/tcl/ecommerce-procs-postgresql.xql 8 Dec 2002 21:38:13 -0000 1.10.2.1 +++ openacs-4/packages/ecommerce/tcl/ecommerce-procs-postgresql.xql 14 May 2003 19:52:45 -0000 1.10.2.2 @@ -40,6 +40,14 @@ + + + select category_id, subcategory_id, subsubcategory_id, product_id + from ($common_sql) as dummy + limit 1 + + + select case when current_timestamp > available_date then 1 when current_timestamp-available_date is NULL then 1 else 0 end as available_p, Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql 26 May 2002 04:36:49 -0000 1.6 +++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql 14 May 2003 19:52:45 -0000 1.6.2.1 @@ -151,15 +151,24 @@ - + - select ss.subsubcategory_id - from ec_subsubcategory_product_map m, ec_subsubcategories ss - where m.subsubcategory_id = ss.subsubcategory_id - and ss.subcategory_id = :subcategory_id - and m.product_id = :product_id + (select cpm.category_id, bla.subcategory_id, cpm.product_id + from ec_category_product_map cpm + left join (select sc.category_id, spm.subcategory_id, spm.product_id + from ec_subcategory_product_map spm, ec_subcategories sc + where sc.subcategory_id = spm.subcategory_id) as bla + using (category_id, product_id) + where cpm.product_id = :product_id + ) as bogus + left join (select sc.category_id, ssc.subcategory_id, sspm.subsubcategory_id, sspm.product_id + from ec_subsubcategory_product_map sspm, ec_subcategories sc, ec_subsubcategories ssc + where sspm.subsubcategory_id = ssc.subsubcategory_id + and ssc.subcategory_id = sc.subcategory_id + ) as boring + using (category_id, subcategory_id, product_id) - +