Index: openacs-4/packages/ecommerce/ecommerce.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/ecommerce.info,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/ecommerce/ecommerce.info	19 Sep 2002 21:31:14 -0000	1.27
+++ openacs-4/packages/ecommerce/ecommerce.info	19 Sep 2002 23:38:19 -0000	1.28
@@ -5,7 +5,7 @@
     <package-name>E-Commerce</package-name>
     <pretty-plural>E-Commerce-ii</pretty-plural>
     <initial-install-p>f</initial-install-p>
-    <singleton-p>t</singleton-p>
+    <singleton-p>f</singleton-p>
 
     <version name="4.6" url="http://www.arsdigita.com/acs-repository/download/apm/ecommerce-4.6.apm">
     <database-support>
@@ -708,6 +708,8 @@
             <file type="content_page" path="www/billing.tcl"/>
             <file type="content_page" path="www/browse-categories.adp"/>
             <file type="content_page" path="www/browse-categories.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/category-browse-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/category-browse-postgresql.xql"/>
             <file type="query_file" db_type="oracle" path="www/category-browse-subcategory-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/category-browse-subcategory-postgresql.xql"/>
             <file type="content_page" path="www/category-browse-subcategory.adp"/>
Index: openacs-4/packages/ecommerce/www/category-browse-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/category-browse-oracle.xql	19 Sep 2002 23:38:18 -0000	1.1
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms>
+    <type>oracle</type>
+    <version>8.1.6</version>
+  </rdbms>
+
+  <fullquery name="get_recommended_products">      
+    <querytext>
+      select p.product_id, p.product_name, p.dirname, r.recommendation_text, o.offer_code
+      from ec_product_recommendations r, 
+      ec_products_displayable p, ec_user_session_offer_codes o
+      where (p.product_id=o.product_id(+) and (user_session_id=:user_session_id or user_session_id is null))
+      and p.product_id = r.product_id
+      and r.${sub}category_id=:${sub}category_id
+      and r.active_p='t'
+      and (r.user_class_id is null or r.user_class_id in (select user_class_id 
+          from ec_user_class_user_map m 
+          where user_id=:user_id
+          $user_class_approved_p_clause))
+      order by p.product_name
+    </querytext>
+  </fullquery>
+
+  <fullquery name="get_regular_product_list">      
+    <querytext>
+      select p.product_id, p.product_name, p.one_line_description, o.offer_code
+      from $product_map($sub) m, ec_products_searchable p, ec_user_session_offer_codes o
+      where (p.product_id=o.product_id(+) and (user_session_id=:user_session_id or user_session_id is null))
+      and p.product_id = m.product_id
+      and m.${sub}category_id = :${sub}category_id
+      $exclude_subproducts
+      order by p.product_name
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/ecommerce/www/category-browse-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/category-browse-postgresql.xql	19 Sep 2002 23:38:18 -0000	1.1
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms>
+    <type>postgresql</type>
+    <version>7.1</version>
+  </rdbms>
+
+  <fullquery name="get_recommended_products">      
+    <querytext>
+      select p.product_id, p.product_name, p.dirname, r.recommendation_text, o.offer_code
+      from ec_product_recommendations r, 
+          ec_products_displayable p left outer join ec_user_session_offer_codes o on 
+          (p.product_id = o.product_id and user_session_id = :user_session_id)
+      where p.product_id = r.product_id
+      and r.${sub}category_id=:${sub}category_id
+      and r.active_p='t'
+      and (r.user_class_id is null or r.user_class_id in (select user_class_id 
+          from ec_user_class_user_map m 
+          where user_id=:user_id
+          $user_class_approved_p_clause))
+      order by p.product_name
+    </querytext>
+  </fullquery>
+
+  <fullquery name="get_regular_product_list">      
+    <querytext>
+      select p.product_id, p.product_name, p.one_line_description, o.offer_code
+      from $product_map($sub) m, ec_products_searchable p left outer join ec_user_session_offer_codes o on (p.product_id = o.product_id and user_session_id = :user_session_id)
+      where p.product_id = m.product_id
+      and m.${sub}category_id = :${sub}category_id
+      $exclude_subproducts
+      order by p.product_name
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/ecommerce/www/category-browse.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/category-browse.xql	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/category-browse.xql	19 Sep 2002 23:38:18 -0000	1.3
@@ -1,3 +1,4 @@
+
 <?xml version="1.0"?>
 
 <queryset>
@@ -43,34 +44,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="get_recommended_products">      
-    <querytext>
-      select p.product_id, p.product_name, p.dirname, r.recommendation_text, o.offer_code
-      from ec_product_recommendations r, 
-          ec_products_displayable p left outer join ec_user_session_offer_codes o on 
-          (p.product_id = o.product_id and user_session_id = :user_session_id)
-      where p.product_id = r.product_id
-      and r.${sub}category_id=:${sub}category_id
-      and r.active_p='t'
-      and (r.user_class_id is null or r.user_class_id in (select user_class_id 
-          from ec_user_class_user_map m 
-          where user_id=:user_id
-          $user_class_approved_p_clause))
-      order by p.product_name
-    </querytext>
-  </fullquery>
-
-  <fullquery name="get_regular_product_list">      
-    <querytext>
-      select p.product_id, p.product_name, p.one_line_description, o.offer_code
-      from $product_map($sub) m, ec_products_searchable p left outer join ec_user_session_offer_codes o on (p.product_id = o.product_id and user_session_id = :user_session_id)
-      where p.product_id = m.product_id
-      and m.${sub}category_id = :${sub}category_id
-      $exclude_subproducts
-      order by p.product_name
-    </querytext>
-  </fullquery>
-
   <fullquery name="get_subcategories">      
     <querytext>
       select * from ec_sub${sub}categories c