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 -r1.7 -r1.8
--- openacs-4/packages/lors/tcl/lors-procs.tcl	6 Apr 2007 19:28:17 -0000	1.7
+++ openacs-4/packages/lors/tcl/lors-procs.tcl	3 Sep 2008 16:33:19 -0000	1.8
@@ -13,7 +13,7 @@
 
 ad_proc -public lors::object_url {
     -object_id
-    
+    {-man_id ""}
     {-url "view"}
 } {
      Generate a URL for an acs_object as a learning object
@@ -44,21 +44,28 @@
                     # FIXME either 1) make this magically work
                     # or 2) find the assessment_id and use 
                     # page anchor
-		    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"
+		    set assessment_id ""
+		    set sort_order ""
+		    db_0or1row 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/questions \
-                                {assessment_id}]\#${sort_order}
+                                -base questions \
+                                {man_id assessment_id}][ad_decode {$sort_order eq ""} 0 "\#${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]
-		    if {[catch {set url [[$page set package_id] make_link -privilege public -url $url $page edit ""]} errmsg]} {
+		    if {[catch {set url [[$page set package_id] make_link -privilege public -link $url $page edit ""]} errmsg]} {
                         set url [$page make_link -privilege public -url $url $page edit ""]
                     }
 
 		    return "${url}&return_url=[ad_urlencode [ad_return_url]]"
-                }
+                
+		}
+		default {
+		    set item_id [content::revision::item_id -revision_id $object_id]
+		    return [export_vars -base "item-add-edit" {man_id item_id {return_url [ad_return_url]}}]
+		}
             }
                 
         }
@@ -78,4 +85,4 @@
     @param man_id Manifst id for one course
 } {
     return [db_list_of_lists get_items ""]
-}
\ No newline at end of file
+}