Index: openacs-4/packages/acs-templating/tcl/paginator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/paginator-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/tcl/paginator-procs.tcl	9 May 2001 05:15:58 -0000	1.3
+++ openacs-4/packages/acs-templating/tcl/paginator-procs.tcl	8 Jun 2001 01:49:34 -0000	1.4
@@ -67,7 +67,7 @@
 
 # Initialize a paginated query.  Only called by create.
 
-ad_proc -public template::paginator::init { statement_name result_name query } {
+ad_proc -public template::paginator::init { statement_name name query } {
 
   get_reference
 
@@ -96,15 +96,15 @@
     }
     
     set properties(context_ids) $context_ids
-    cache set $result_name:$query:context_ids $context_ids $properties(timeout)
+    cache set $name:$query:context_ids $context_ids $properties(timeout)
 
 
     if { [template::util::is_nil row_ids] } {
 	set row_ids ""
     }
 
     set properties(row_ids) $row_ids
-    cache set $result_name:$query:row_ids $row_ids $properties(timeout)
+    cache set $name:$query:row_ids $row_ids $properties(timeout)
 
 
   } else {
@@ -113,7 +113,7 @@
     uplevel 3 "template::query $statement_name __paginator_ids onelist \"$query\""
 
     set properties(row_ids) $ids
-    cache set $result_name:$query:row_ids $ids $properties(timeout)
+    cache set $name:$query:row_ids $ids $properties(timeout)
   }
 }
 
@@ -436,6 +436,7 @@
   template::util::list_to_lookup $ids row_order
 
   # substitute the current page set
+  set query [uplevel 2 "db_map ${statement_name}_partial"]
   set in_list [join $ids ","]
   if { ! [regsub CURRENT_PAGE_SET $query $in_list query] } {
     error "Token CURRENT_PAGE_SET not found in page data query: $query"