Index: openacs-4/packages/lors/tcl/lors-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lors/tcl/lors-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/lors/tcl/lors-procs.tcl	7 Mar 2007 03:10:53 -0000	1.6
+++ openacs-4/packages/lors/tcl/lors-procs.tcl	6 Apr 2007 19:28:17 -0000	1.7
@@ -44,16 +44,20 @@
                     # FIXME either 1) make this magically work
                     # or 2) find the assessment_id and use 
                     # page anchor
-		    #set assessment_id [db_string get_assessment_id "select ci.item_id, m.assessment_id from cr_items ci, cr_revisions cr, as_assessment_section_map m where cr.item_id=:object_id and cr.revision_id=m.section_id and ci.latest_revision=assessment_id"]
-		    set assessment_id ""
+		    db_1row get_assessment_id "select ci.item_id as assessment_id, sort_order from cr_items ci, cr_revisions cr, as_assessment_section_map m where cr.item_id=:object_id and cr.revision_id=m.section_id and ci.latest_revision=assessment_id"
+
                     return [export_vars \
-                                -base ../assessment/asm-admin/one-a \
-                                {assessment_id}]
+                                -base ../../assessment/asm-admin/questions \
+                                {assessment_id}]\#${sort_order}
                 }
                 "::xowiki::Page" {
 		    set url [::xowiki::Package get_url_from_id -item_id $object_id]
 	            set page [::xowiki::Package instantiate_page_from_id -item_id $object_id]
-		    return [$page make_link -privilege public -url $url $page edit ""]		    
+		    if {[catch {set url [[$page set package_id] make_link -privilege public -url $url $page edit ""]} errmsg]} {
+                        set url [$page make_link -privilege public -url $url $page edit ""]
+                    }
+
+		    return "${url}&return_url=[ad_urlencode [ad_return_url]]"
                 }
             }
                 
@@ -64,3 +68,14 @@
 
     }
 }
+
+ad_proc lors::items_select_options {
+    -man_id
+} {
+    Generate a list of lists of names and ims_item_ids of 
+    items in one course
+
+    @param man_id Manifst id for one course
+} {
+    return [db_list_of_lists get_items ""]
+}
\ No newline at end of file
Index: openacs-4/packages/lors/tcl/lors-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lors/tcl/lors-procs.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lors/tcl/lors-procs.xql	6 Apr 2007 19:28:17 -0000	1.1
@@ -0,0 +1,48 @@
+<? xml version="1.0" ?>
+
+<queryset>
+
+<fullquery name="lors::items_select_options.get_items">
+    <querytext>
+        SELECT
+                i.item_title as item_title,
+		i.ims_item_id as item_id
+        FROM 
+		acs_objects o, ims_cp_items i, ims_cp_manifests m,
+                ims_cp_organizations io,
+		ims_cp_items_to_resources i2r,ims_cp_resources r left
+		join acs_object_types ot on r.type=ot.object_type
+	WHERE 
+		o.object_type = 'ims_item_object'
+           AND
+		i.org_id = io.org_id
+           AND  io.man_id = m.man_id
+	   AND
+		o.object_id = i.ims_item_id
+           AND  r.res_id=i2r.res_id
+           AND  i2r.ims_item_id=i.ims_item_id
+           AND
+                i.ims_item_id = (
+                                select
+                                        live_revision
+                                from
+                                        cr_items
+                                where
+                                        item_id = (
+                                                  select
+                                                         item_id
+                                                  from
+                                                         cr_revisions
+                                                  where
+                                                         revision_id = i.ims_item_id
+                                                  )
+                               )
+           AND
+                m.man_id = :man_id
+        ORDER BY 
+                 i.sort_order,o.tree_sortkey,o.object_id
+
+    </querytext>
+</fullquery>
+
+</queryset>
\ No newline at end of file