Fisheye: Tag 1.3.2.2 refers to a dead (removed) revision in file `openacs-4/packages/categories/www/categories-browse-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.2.2 refers to a dead (removed) revision in file `openacs-4/packages/categories/www/categories-browse-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/categories/www/categories-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse.adp,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/categories/www/categories-browse.adp	7 Aug 2017 23:48:05 -0000	1.9
+++ openacs-4/packages/categories/www/categories-browse.adp	10 Mar 2021 13:16:15 -0000	1.9.2.1
@@ -17,40 +17,7 @@
 </form>
 
 #categories.lt_To_deselect_or_select#
-<p>
+<p>@dimension_bar;noquote@</p>
+<p>#categories.lt_object_count_objects_#</p>
 
-<!-- pagination context bar -->
-<table cellpadding="4" cellspacing="0" border="0" width="95%">
-<tr><td></td><td align="center">#categories.lt_object_count_objects_#</td><td></td></tr>
-<tr>
-  <td align="left" width="5%">
-    <if @info.previous_group@ not nil>
-      <a href="categories-browse?page=@info.previous_group@&amp;@url_vars@&amp;orderby=@orderby@">&lt;&lt;</a>&nbsp;
-    </if>
-    <if @info.previous_page@ gt 0>
-      <a href="categories-browse?page=@info.previous_page@&amp;@url_vars@&amp;orderby=@orderby@">&lt;</a>&nbsp;
-    </if>
-  </td>
-  <td align="center">
-    <multiple name=pages>
-      <if @page@ ne @pages.page@>
-        <a href="categories-browse?page=@pages.page@&amp;@url_vars@&amp;orderby=@orderby@">@pages.page@</a>
-      </if>
-      <else>
-        @page@
-      </else>
-    </multiple>
-  </td>
-  <td align="right" width="5%">
-    <if @info.next_page@ not nil>
-      &nbsp;<a href="categories-browse?page=@info.next_page@&amp;@url_vars@&amp;orderby=@orderby@">&gt;</a>
-    </if>
-    <if @info.next_group@ not nil>
-      &nbsp;<a href="categories-browse?page=@info.next_group@&amp;@url_varse@&amp;orderby=@orderby@">&gt;&gt;</a>
-    </if>
-  </td>
-</tr>
-</table>
-@dimension_bar;noquote@
-<p>
 <listtemplate name="items_list"></listtemplate>
Index: openacs-4/packages/categories/www/categories-browse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse.tcl,v
diff -u -r1.14.2.2 -r1.14.2.3
--- openacs-4/packages/categories/www/categories-browse.tcl	9 Mar 2021 14:25:45 -0000	1.14.2.2
+++ openacs-4/packages/categories/www/categories-browse.tcl	10 Mar 2021 13:16:15 -0000	1.14.2.3
@@ -14,7 +14,7 @@
     {subtree_p:boolean,optional f}
     {letter:optional all}
     {join:optional or}
-    package_id:naturalnum,optional
+    {package_id:naturalnum,optional ""}
 } -properties {
     page_title:onevalue
     context_bar:onevalue
@@ -39,22 +39,15 @@
 set url_vars [export_vars {tree_ids:multiple category_ids:multiple subtree_p letter join package_id}]
 set form_vars [export_vars -form {tree_ids:multiple orderby subtree_p letter package_id}]
 
-db_transaction {
-    # use temporary table to use only bind vars in queries
-    foreach tree_id $tree_ids {
-	db_dml insert_tmp_category_trees ""
-    }
-    set tree_ids [db_list check_permissions_on_trees {
-      select t.tree_id
-      from category_trees t, category_temp tmp
-      where (
-         t.site_wide_p = 't'
-         or acs_permission.permission_p(t.tree_id, :user_id, 'category_tree_read')
-      )
-      and t.tree_id = tmp.category_id
-    }]
-}
-db_dml delete_tmp_category_trees ""
+set tree_ids [db_list check_permissions_on_trees [subst {
+  select t.tree_id
+  from category_trees t
+  where (
+     t.site_wide_p = 't'
+     or acs_permission.permission_p(t.tree_id, :user_id, 'category_tree_read')
+  )
+  and t.tree_id in ([ns_dbquotelist $tree_ids])
+}]]
 
 template::multirow create trees tree_id tree_name category_id category_name indent selected_p
 template::util::list_to_lookup $category_ids category_selected
@@ -72,36 +65,7 @@
     }
 }
 
-template::list::create -name items_list -multirow items \
-    -html {align center} \
-    -elements {
-	object_name {
-	    label "Object Name"
-	    display_template {
-		<a href="/o/@items.object_id@">@items.object_name@</a>
-	    }
-	    orderby {n.object_name}
-	}
-	instance_name {
-	    label "Package"
-	    display_template {
-		<a href="/o/@items.package_id@">@items.instance_name@</a>
-	    }
-	    html {align right}
-	}
-	package_type {
-	    label "Package Type"
-	    html {align right}
-	}
-	creation_date {
-	    label "Creation Date"
-	    html {align right}
-	}
-    } \
-    -filters {subtree_p {} letter {} tree_ids {}}
 
-set order_by_clause [template::list::orderby_clause -orderby -name items_list]
-
 set dimensional_def {
     {subtree_p "Categorization" f {
 	{f "Exact"}
@@ -144,27 +108,14 @@
 ns_set delkey $form button
 set dimension_bar [ad_dimensional $dimensional_def categories-browse $form]
 
-# generate sql for selecting object names beginning with selected letter
-switch -exact $letter {
-    other {
-	set letter_sql [db_map other_letter]
-    }
-    all {
-	set letter_sql ""
-    }
-    default {
-	set bind_letter "$letter%"
-	set letter_sql [db_map regular_letter]
-    }
-}
-
-if {[info exists package_id]} {
-    set package_sql [db_map package_objects]
+set category_ids_length [llength $category_ids]
+if {$category_ids_length == 0} {
+    set category_clause "(select category_id from categories
+                           where tree_id in ([ns_dbquotelist $tree_ids]))"
 } else {
-    set package_sql ""
+    set category_clause ([ns_dbquotelist $category_ids])
 }
 
-set category_ids_length [llength $category_ids]
 if {$join eq "and"} {
     # combining categories with and
     if {$subtree_p == "t"} {
@@ -185,49 +136,77 @@
     }
 }
 
-set p_name "browse_categories"
-request create
-request set_param page -datatype integer -value 1
+set rows_per_page 20
 
-db_transaction {
-    # use temporary table to use only bind vars in queries
-    foreach category_id $category_ids {
-	db_dml insert_tmp_categories ""
-    }
+template::list::create \
+    -name items_list \
+    -multirow items \
+    -key object_id \
+    -page_size $rows_per_page \
+    -page_groupsize 10 \
+    -page_flush_p true \
+    -page_query {
+        select n.object_id
+          from acs_objects n, ($subtree_sql) s
+         where n.object_id = s.object_id
+           and acs_permission.permission_p(n.object_id, :user_id, 'read')
+           and (:package_id is null or n.package_id = :package_id)
+           and (:letter = 'all' or
+                (:letter = 'other' and (upper(n.title) < 'A' or upper(n.title) > 'Z')) or
+                upper(n.title) like :letter || '%'
+               )
+        [template::list::orderby_clause -orderby -name items_list]
+    } \
+    -elements {
+	object_name {
+	    label "Object Name"
+            link_url_col object_url
+	    orderby {n.title}
+	}
+	instance_name {
+	    label "Package"
+            link_url_col package_url
+	    html {align right}
+	}
+	package_type {
+	    label "Package Type"
+	    html {align right}
+	}
+	creation_date {
+	    label "Creation Date"
+	    html {align right}
+	}
+    } \
+    -filters {subtree_p {} letter {} tree_ids {}}
 
-    # execute query to count objects and pages
-    # apisano: this particular statement contains $ variables, so it
-    # cannot be passed by name to the paginator, or such variables
-    # won't be resolved correctly insite the machinery.  Just compute
-    # the sql text here and pass it as is.    
-    set sql [subst {
-      select n.object_id
-      from acs_named_objects n, ($subtree_sql) s
-      where n.object_id = s.object_id
-      and   acs_permission.permission_p(n.object_id, :user_id, 'read')
-      $letter_sql
-      $package_sql
-    }]
-    paginator create -- $p_name $sql -pagesize 20 -groupsize 10 -contextual -timeout 0
 
-    set first_row [paginator get_row $p_name $page]
-    set last_row [paginator get_row_last $p_name $page]
-
-    # execute query to get the objects on current page
-    db_multirow items get_categorized_objects {} {}
+# execute query to get the objects on current page
+db_multirow -extend {
+    object_url
+    package_url
+} items get_categorized_objects [subst {
+    select n.object_id,
+           n.title as object_name,
+           n.creation_date,
+           t.pretty_name as package_type,
+           n.package_id,
+           p.instance_name
+      from acs_objects n,
+           apm_packages p,
+           apm_package_types t
+     where p.package_id = n.package_id
+       and t.package_key = p.package_key
+       [template::list::page_where_clause -name items_list -and]
+       [template::list::orderby_clause -orderby -name items_list]
+}] {
+    set object_url /o/${object_id}
+    set package_url /o/${package_id}
 }
-db_dml delete_tmp_category_trees ""
 
-paginator get_display_info $p_name info $page
-set group [paginator get_group $p_name $page]
-paginator get_context $p_name pages [paginator get_pages $p_name $group]
-paginator get_context $p_name groups [paginator get_groups $p_name $group 10]
+set object_count [template::list::get_rowcount -name items_list]
+set page_count [expr {int($object_count / $rows_per_page) + 1}]
 
-set object_count [paginator get_row_count $p_name]
-set page_count [paginator get_page_count $p_name]
 
-ad_return_template
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/categories/www/categories-browse.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse.xql,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/categories/www/categories-browse.xql	7 Aug 2017 23:48:05 -0000	1.4
+++ openacs-4/packages/categories/www/categories-browse.xql	10 Mar 2021 13:16:15 -0000	1.4.2.1
@@ -2,44 +2,13 @@
 
 <queryset>
 
-  <fullquery name="insert_tmp_category_trees">
-    <querytext>
-      insert into category_temp
-      values (:tree_id)
-    </querytext>
-  </fullquery>
-
-  <fullquery name="delete_tmp_category_trees">
-    <querytext>
-      delete from category_temp
-    </querytext>
-  </fullquery>
-
-  <partialquery name="other_letter">
-    <querytext>
-      and (upper(n.object_name) < 'A' or upper(n.object_name) > 'Z')
-    </querytext>
-  </partialquery>
-
-  <partialquery name="regular_letter">
-    <querytext>
-      and upper(n.object_name) like :bind_letter
-    </querytext>
-  </partialquery>
-
-  <partialquery name="package_objects">
-    <querytext>
-      and n.package_id = :package_id
-    </querytext>
-  </partialquery>
-
   <partialquery name="include_subtree_and">
     <querytext>
       select v.object_id
       from (select distinct m.object_id, c.category_id
             from category_object_map m, categories c,
-                 categories c_sub, category_temp t
-            where c.category_id = t.category_id
+                 categories c_sub
+            where c.category_id in $category_clause
             and m.category_id = c_sub.category_id
             and c_sub.tree_id = c.tree_id
             and c_sub.left_ind >= c.left_ind
@@ -51,8 +20,8 @@
   <partialquery name="exact_categorization_and">
     <querytext>
       select m.object_id
-      from category_object_map m, category_temp t
-      where m.category_id = t.category_id
+      from category_object_map m
+      where m.category_id in $category_clause
       group by m.object_id having count(*) = :category_ids_length
     </querytext>
   </partialquery>
@@ -61,8 +30,8 @@
     <querytext>
       select distinct m.object_id
       from category_object_map m, categories c,
-           categories c_sub, category_temp t
-      where c.category_id = t.category_id
+           categories c_sub
+      where c.category_id in $category_clause
       and m.category_id = c_sub.category_id
       and c_sub.tree_id = c.tree_id
       and c_sub.left_ind >= c.left_ind
@@ -73,16 +42,9 @@
   <partialquery name="exact_categorization_or">
     <querytext>
       select distinct m.object_id
-      from category_object_map m, category_temp t
-      where m.category_id = t.category_id
+      from category_object_map m
+      where m.category_id in $category_clause
     </querytext>
   </partialquery>
 
-  <fullquery name="insert_tmp_categories">
-    <querytext>
-      insert into category_temp
-      values (:category_id)
-    </querytext>
-  </fullquery>
-
 </queryset>