Index: openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql	25 Oct 2004 18:33:14 -0000	1.1
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql	8 Jan 2005 16:30:07 -0000	1.2
@@ -1,21 +1,24 @@
-<?xml version="1.0"?>
-
-<queryset>
-<rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-<fullquery name="get_grades">      
-      <querytext>
-
-		select eg.grade_plural_name,
-		eg.grade_id,
-		eg.grade_item_id
-   	 	from evaluation_grades eg, acs_objects ao, cr_items cri
-		where cri.live_revision = eg.grade_id
-	          and eg.grade_item_id = ao.object_id	
-   		  and ao.context_id in  ([join $list_of_package_ids ,])
-		order by grade_plural_name desc
-	
-      </querytext>
-</fullquery>
-
-</queryset>
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="assessments">
+        <querytext>
+	   select cri.item_id as assessment_id, 
+            crr.title, 
+	    crr.description,
+	    acs_object__name(apm_package__parent_id(crf.package_id)) as parent_name,
+            (select site_node__url(site_nodes.node_id)
+              from site_nodes
+             where site_nodes.object_id = crf.package_id) as url
+	   from as_assessments asa, cr_items cri, cr_revisions crr, cr_folders crf
+	   where crr.revision_id = asa.assessment_id
+	     and crr.revision_id = cri.latest_revision
+	     and cri.parent_id = crf.folder_id
+	     and crf.package_id in ([join $list_of_package_ids ", "])
+	   order by lower(crr.title)
+        </querytext>
+    </fullquery>
+
+</queryset>