Index: openacs-4/packages/ecommerce/www/admin/products/list-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/list-oracle.xql,v
diff -u -r1.1 -r1.1.10.1
--- openacs-4/packages/ecommerce/www/admin/products/list-oracle.xql	10 Jul 2001 20:33:53 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/products/list-oracle.xql	11 Jun 2005 10:18:20 -0000	1.1.10.1
@@ -3,14 +3,31 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
+<fullquery name="product_select_count">      
+      <querytext>
+      select count(*) as product_count
+from ec_products ep, ec_items_reportable eir, ec_product_comments epc
+where ep.product_id = eir.product_id(+) 
+and ep.product_id = epc.product_id(+) $category_exclusion_clause
+      </querytext>
+</fullquery>
+
 <fullquery name="product_select">      
       <querytext>
+        select r.*
+        from (
+            select rownum as r_rownum, q.*
+            from (
       select ep.product_id, ep.product_name, ep.available_date, count(distinct eir.item_id) as n_items_ordered, count(distinct epc.comment_id) as n_comments
 from ec_products ep, ec_items_reportable eir, ec_product_comments epc
 where ep.product_id = eir.product_id(+) 
 and ep.product_id = epc.product_id(+) $category_exclusion_clause
 group by ep.product_id, ep.product_name, ep.available_date
 $order_by_clause
+            ) q
+        ) r
+        where r_rownum > :start_row
+        and r_rownum <= :start_row + :how_many
       </querytext>
 </fullquery>
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/products/list-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/products/list.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/ecommerce/www/admin/products/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/list.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/ecommerce/www/admin/products/list.tcl	9 Mar 2004 00:59:51 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/products/list.tcl	11 Jun 2005 10:18:20 -0000	1.5.2.1
@@ -1,14 +1,19 @@
 #  www/[ec_url_concat [ec_url] /admin]/products/list.tcl
 ad_page_contract {
-  Lists a class of products, ordered to the user's taste.
+    Lists a class of products, ordered to the user's taste.
 
-  @author Philip Greenspun (philg@mit.edu)
-  @creation-date July 18, 1999
-  @cvs-id $Id$
-  @author ported by Jerry Asher (jerry@theashergroup.com)
+    @param how_many How many products to display on the page
+    @param start_row Where to begin from
+
+    @author Philip Greenspun (philg@mit.edu)
+    @creation-date July 18, 1999
+    @cvs-id $Id$
+    @author ported by Jerry Asher (jerry@theashergroup.com)
 } {
-  category_id:integer,notnull,optional
-  order_by:optional
+    category_id:integer,notnull,optional
+    order_by:optional
+    {how_many:naturalnum {[ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce]}}
+    {start_row:naturalnum "0"}
 }
 
 ad_require_permission [ad_conn package_id] admin
@@ -40,38 +45,67 @@
     set ordering_options "<a href=\"${menubar_stub}order_by=sales\">sales</a> | <a href=\"${menubar_stub}order_by=name\">name</a> | age | <a href=\"${menubar_stub}order_by=comments\">comments</a>"
 }
 
-doc_body_append "[ad_admin_header $title]
+append title ", order by $ordering_options"
+set context_bar [ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Products"] $title]
 
-<h2>$title</h2>
 
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "Products"] $title]
 
-<hr>
+set list_items ""
 
-order by $ordering_options
+set have_how_many_more_p f
+set count $start_row
 
-<ul>
-"
+db_1row product_select_count "
+    select count(*) as product_count
+    from ec_products ep
+	LEFT JOIN ec_items_reportable eir using (product_id)
+	LEFT JOIN ec_product_comments epc on (ep.product_id = epc.product_id)
+    $category_exclusion_clause"
 
-set list_items ""
-
 db_foreach product_select "SELECT ep.product_id, ep.product_name, ep.available_date, count(distinct eir.item_id) as n_items_ordered, count(distinct epc.comment_id) as n_comments FROM ec_products ep, ec_items_reportable eir, ec_product_comments epc WHERE ep.product_id = eir.product_id(+) AND ep.product_id = epc.product_id(+) GROUP BY ep.product_id, ep.product_name, ep.available_date $category_exclusion_clause $order_by_clause" {
+
     append list_items "<li><a href=\"one?[export_url_vars product_id]\">$product_name</a>
-<font size=-1>(available since [util_AnsiDatetoPrettyDate $available_date]; $n_items_ordered sold"
+    <font size=-1>(available since [util_AnsiDatetoPrettyDate $available_date]; $n_items_ordered sold"
     if { $n_comments > 0 } {
 	append list_items "; <a href=\"../customer-reviews/index-2?[export_url_vars product_id]\">$n_comments customer reviews</a>"
     }
-    append list_items ")</font>\n"
-
+    append list_items ")</font></li>"
+    incr count
 }
+if { $product_count > [expr $start_row + (2 * $how_many)] } {
+    # We know there are at least how_many more items to display
+    # next time
+    set have_how_many_more_p t
+} else {
+    set have_how_many_more_p f
+}
 
 if { [empty_string_p $list_items] } {
-    doc_body_append "No products found.\n"
+    set list_items "<p>No products found.</p>"
 } else {
-    doc_body_append $list_items
+    set list_items "<ul>$list_items</ul>"
 }
 
-doc_body_append "</ul>
+if { $start_row >= $how_many } {
+    set prev_link "<a href=\"[ad_conn url]?[export_url_vars category_id how_many]&start_row=[expr $start_row - $how_many]\">Previous $how_many</a>"
+} else {
+    set prev_link ""
+}
 
-[ad_admin_footer]
-"
+if { $have_how_many_more_p == "t" } {
+    set next_link "<a href=\"[ad_conn url]?[export_url_vars category_id how_many]&start_row=[expr $start_row + $how_many]\">Next $how_many</a>"
+} else {
+    set number_of_remaining_products [expr $product_count - $start_row - $how_many]
+    if { $number_of_remaining_products > 0 } {
+	set next_link "<a href=\"[ad_conn url]?[export_url_vars category_id how_many]&start_row=[expr $start_row + $how_many]\">Next $number_of_remaining_products</a>"
+    } else {
+	set next_link ""
+    }
+}
+
+if { [empty_string_p $next_link] || [empty_string_p $prev_link] } {
+    set separator ""
+} else {
+    set separator "|"
+}
+
Index: openacs-4/packages/ecommerce/www/admin/products/list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/list.xql,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/ecommerce/www/admin/products/list.xql	8 Mar 2004 19:46:14 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/products/list.xql	11 Jun 2005 10:18:20 -0000	1.2.2.1
@@ -6,21 +6,5 @@
       select category_name from ec_categories where category_id = :category_id
       </querytext>
 </fullquery>
-
  
-<fullquery name="product_select">      
-      <querytext>
-
-select ep.product_id, ep.product_name, ep.available_date, count(distinct eir.item_id) as n_items_ordered, count(distinct epc.comment_id) as n_comments
-from ec_products ep
-	LEFT JOIN ec_items_reportable eir using (product_id)
-	LEFT JOIN ec_product_comments epc on (ep.product_id = epc.product_id)
-group by ep.product_id, ep.product_name, ep.available_date
-$category_exclusion_clause
-$order_by_clause
-
-      </querytext>
-</fullquery>
-
- 
 </queryset>