Index: dotlrn_packages/lams2int/www/admin/add.tcl =================================================================== RCS file: /usr/local/cvsroot/dotlrn_packages/lams2int/www/admin/add.tcl,v diff -u -r1.4 -r1.5 --- dotlrn_packages/lams2int/www/admin/add.tcl 13 Aug 2008 00:32:29 -0000 1.4 +++ dotlrn_packages/lams2int/www/admin/add.tcl 1 Sep 2008 04:55:50 -0000 1.5 @@ -6,7 +6,7 @@ @author Ernie Ghiglione (ErnieG@melcoe.mq.edu.au) @creation-date 2007-04-16 - @cvs-id add.tcl,v 1.1 2007/09/12 06:37:02 ernieg Exp + @cvs-id $Id$ } { } -properties { @@ -27,23 +27,23 @@ # get course data set course_id [dotlrn_community::get_community_id] set course_url "[ad_url][dotlrn_community::get_community_url $course_id]" +set course_name "[ad_urlencode [dotlrn_community::get_community_name $course_id]]" #set datetime 1 set hashValue [lams2int::ws::generate_hash -datetime $datetime -username $username -method "author"] - # get variables to pass to LAMS -set requestSrc [lams2int::get_request_source] +set requestSrc "[ad_urlencode [lams2int::get_request_source]]" set notifyCloseURL "[ad_url][util_get_current_url]" # get seq list set hashSeq [lams2int::ws::generate_hash -datetime $datetime -username $username] -set get_sequences_url "$lams_server_url/services/xml/LearningDesignRepository?serverId=$server_id&datetime=[ad_urlencode $datetime]&hashValue=$hashSeq&username=$username&courseId=$course_id&mode=2&country=AU&lang=en" +set get_sequences_url "$lams_server_url/services/xml/LearningDesignRepository?serverId=$server_id&datetime=[ad_urlencode $datetime]&hashValue=$hashSeq&username=$username&courseId=$course_id&mode=2&country=AU&lang=en&coursename=$course_name" ns_log Notice "URL requested $get_sequences_url" @@ -52,6 +52,12 @@ ad_script_abort } +# if the response status isn't 200, then we throw a complaint +if {![string equal [lindex $return_string 3] "200"] } { + ad_return_complaint 0 "It seems that your LAMS2 - .LRN Configuration isn't working. Please check the integration configuration and try again. HTTP Response is: [lindex $return_string 3]" + ad_script_abort +} + set xml [lindex $return_string 1] set sequence_list [lams2int::process_sequence_xml -xml $xml]