Index: openacs-4/packages/lorsm/www/delivery/popup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/popup.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/lorsm/www/delivery/popup.adp	7 Jun 2006 14:05:44 -0000	1.2
+++ openacs-4/packages/lorsm/www/delivery/popup.adp	10 Jul 2007 16:37:03 -0000	1.2.2.1
@@ -252,7 +252,7 @@
 }
 
 function init() {
-    this.childwindow=popit('popup','popup2?man_id=@man_id@<if @ims_id@ defined>&ims_id=@ims_id@</if>&track_id=@track_id@<if @menu_off@ defined>&menu_off=@menu_off@</if> ',810,540,20,20);
+    this.childwindow=popit('popup','popup2?man_id=@man_id@<if @ims_item_id@ defined>&ims_id=@ims_item_id@</if>&track_id=@track_id@<if @menu_off@ defined>&menu_off=@menu_off@</if> ',810,540,20,20);
     <if @debuglevel@ gt 0>
     this.debugwindow=popit('debuggerwindow','blank.html',210,640,10,10);
     </if>
@@ -343,7 +343,7 @@
 //chiamata quando trovato adapter
 <if @menu_off@ lt 1>
 childwindow.frames['content'].window.location.href = "blank.html";
-childwindow.frames['content'].window.location.href = "<if @ims_id@ defined>@body_url;noquote@</if><else>body?man_id=@man_id@</else>";
+childwindow.frames['content'].window.location.href = "<if @ims_item_id@ defined>@body_url;noquote@</if><else>body?man_id=@man_id@</else>";
 </if>
 //not ready yet to show menu
 //debug(typeof(this.childwindow));
@@ -372,9 +372,9 @@
         KeepAlive();
 	<if @menu_off@ lt 1>
 	childwindow.frames['content'].document.location.href = "blank.html";
-	childwindow.frames['content'].document.location.href = "<if @ims_id@ defined>@body_url;noquote@</if><else>body?man_id=@man_id@</else>";
+	childwindow.frames['content'].document.location.href = "<if @ims_item_id@ defined>@body_url;noquote@</if><else>body?man_id=@man_id@</else>";
 	//let's show menu now
-	childwindow.frames['menu'].document.location.href = "menu?man_id=@man_id@<if @ims_id@ defined>&ims_id=@ims_id@</if>&track_id=@track_id@<if @menu_off@ defined>&menu_off=@menu_off@</if>";
+	childwindow.frames['menu'].document.location.href = "menu?man_id=@man_id@<if @ims_item_id@ defined>&ims_id=@ims_item_id@</if>&track_id=@track_id@<if @menu_off@ defined>&menu_off=@menu_off@</if>";
 	//obviously no menu if menu is off...
 	</if>
 	<else>
@@ -387,10 +387,10 @@
    		myTimer=setTimeout("refreshFrame()",2500);
 		return(0);
 	}
-	childwindow.frames['content'].document.location.href = "record-view?man_id=@man_id@&item_id=@item_id@";
+	childwindow.frames['content'].document.location.href = "record-view?man_id=@man_id@&item_id=@ims_item_id@";
 	childwindow.caller=self;
 	childwindow.focus();
-	debug("calling @man_id@ with @item_id@");
+	debug("calling @man_id@ with @ims_item_id@");
 	</else>
         if (findgetAppletInfo> 7) {
             debug("I cannot talk to APIAdapter: try reloading me. Please notify support of your sw configuration ;) ");
@@ -441,7 +441,6 @@
   <param name = "archive" value = "stuff.jar" >
 
 
-  <comment>
 
   <applet code="org.adl.samplerte.client.APIAdapterApplet.class" MAYSCRIPT
             archive="stuff.jar"
@@ -461,7 +460,7 @@
 </else>
             name="APIAdapter">
 </applet>
-</comment>
+
 </object>
 
 </body>
Index: openacs-4/packages/lorsm/www/delivery/popup.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/popup.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/lorsm/www/delivery/popup.tcl	7 Jun 2006 14:05:44 -0000	1.2
+++ openacs-4/packages/lorsm/www/delivery/popup.tcl	10 Jul 2007 16:37:03 -0000	1.2.2.1
@@ -4,10 +4,9 @@
     @arch-tag: 64f3397b-4558-4298-a995-fc63e472f2a1
     @cvs-id $Id$
 } {
-    item_id:integer,notnull,optional
+    ims_item_id:integer,notnull,optional
     menu_off:integer,notnull,optional
     man_id:integer,notnull
-    ims_id:integer,notnull,optional
 } -properties {
 } -validate {
 } -errors {
@@ -16,6 +15,8 @@
 set debuglevel 0
 
 ad_set_client_property lorsm debuglevel $debuglevel
+#we are in a popup aren't we ?
+set menu_off 1
 
 #keepalive and debug would require this
 set random [clock seconds]
@@ -25,24 +26,20 @@
 set cookie [ad_get_cookie ad_session_id]
 set track_id [ad_get_client_property lorsm studenttrack]
 
-set menu_off 1
-
 # Student tracking
 set package_id [ad_conn package_id]
 set community_id [dotlrn_community::get_community_id]
 set user_id [ad_conn user_id]
 
-if { [info exists ims_id] } {
-    ns_log Notice "APPLET.TCL: ims_id is $ims_id"
-    set body_url [export_vars -base "record-view" -url {item_id man_id}]
-} else {
-    if { ! [empty_string_p $item_id] } {
-    ns_log Notice "APPLET.TCL: item_id is $item_id"
-    set ims_id $item_id
-    set body_url [export_vars -base "record-view" -url {item_id man_id}]
-    }
+if { ! [info exists ims_item_id] } {
+	#since an ims_item_id wasn't provided, we just pick up the first one
+	set item_list [lorsm::get_item_list $man_id $user_id]
+	set ims_item_id [lindex $item_list 0]
 }
 
+ns_log Notice "POPUP.TCL: ims_id is $ims_item_id"
+set body_url [export_vars -base "record-view" -url {ims_item_id man_id}]
+
 # return_url
 set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]]