Index: openacs-4/contrib/packages/cop-ui/www/ratings/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/www/ratings/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/cop-ui/www/ratings/index.tcl	7 May 2004 17:25:40 -0000	1.2
+++ openacs-4/contrib/packages/cop-ui/www/ratings/index.tcl	15 Jun 2004 11:48:50 -0000	1.3
@@ -1,9 +1,9 @@
-# /packages/cop-ui/www/clipboard/view.tcl
+# /packages/cop-ui/www/ratings/index.tcl
 ad_page_contract {
     Display the agg ratings.
 
     @author Jeff Davis (davis@xarg.net)
-    @creation-date 11/12/2003
+    @creation-date 2003-11-23
 
     @cvs-id $Id$
 } {
@@ -21,7 +21,7 @@
 set elements {
     ratings {
         label Ratings
-        display_template {@ratings.ratings@ (<a href="@ratings.object_ratings_url@">show</a>)}
+        display_template {@ratings.all_ratings@ (<a href="@ratings.object_ratings_url@">show</a>)}
     }
     rating_img {
         label "Average"
@@ -42,12 +42,12 @@
     -elements $elements \
     -orderby { 
         ratings {
-            orderby_asc {ratings desc}
-            orderby_desc {ratings asc}
+            orderby_asc {all_ratings desc}
+            orderby_desc {all_ratings asc}
         }
         rating_img { 
-            orderby_asc {rating_ave desc}
-            orderby_desc {rating_ave asc}
+            orderby_asc {all_rating_ave desc}
+            orderby_desc {all_rating_ave asc}
         }
         rated_on { 
             orderby_asc {o.last_modified desc}
@@ -64,14 +64,13 @@
 set node_id [ad_conn node_id]
 set packages [cop::util::packages -node_id $node_id]
 
-set icons [cop::rating::icon_base]
+# JCDXXX: TODO: permissions, recent only, paginate.
 db_multirow -extend {rating_img object_ratings_url rating} ratings ratings "
-    SELECT o.object_id,r.rating_ave, to_char(r.rated_on,'YYYY-MM-DD HH24:MI') as rated_on, o.title as object_title, r.object_one, r.ratings, r.rating_sum, r.rating_ave
-      FROM cop_rating_aggregates r, acs_objects o
-     WHERE o.object_id = r.object_one
+    SELECT o.object_id, to_char(r.rated_on,'YYYY-MM-DD HH24:MI') as rated_on, o.title as object_title, r.all_ratings, r.all_rating_sum,r.all_rating_ave
+      FROM rating_aggregates r, acs_objects o
+     WHERE o.object_id = r.object_id
        and o.package_id in ([join $packages ,])
    [template::list::orderby_clause -orderby -name "ratings"]" {
-       set rating [format %.1f [expr {(round(2.0*$rating_ave))/2.0}]]
-       set rating_img "<img src=\"$icons/s-$rating.gif\" alt=\"$rating\">"
-       set object_ratings_url "./ratings?object_id=$object_one"
+       set rating_img [ratings::icon::html_fragment -rating $all_rating_ave]
+       set object_ratings_url [export_vars -base ratings {object_id}]
    }