Index: tool_adapters/moodle/lams_tool_mdlquiz/.classpath =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/.classpath,v diff -u -r1.2 -r1.3 --- tool_adapters/moodle/lams_tool_mdlquiz/.classpath 16 Nov 2008 23:00:28 -0000 1.2 +++ tool_adapters/moodle/lams_tool_mdlquiz/.classpath 5 Jun 2009 02:17:25 -0000 1.3 @@ -4,12 +4,12 @@ - - - - - - + + + + + + Fisheye: Tag 1.2 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlquiz/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdquiz/model/MdlQuizConfigItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlquiz/conf/language/ApplicationResources.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/conf/language/lams/ApplicationResources.properties,v diff -u -r1.2 -r1.3 --- tool_adapters/moodle/lams_tool_mdlquiz/conf/language/lams/ApplicationResources.properties 10 Dec 2008 22:41:02 -0000 1.2 +++ tool_adapters/moodle/lams_tool_mdlquiz/conf/language/lams/ApplicationResources.properties 5 Jun 2009 02:17:24 -0000 1.3 @@ -11,9 +11,7 @@ activity.description =Moodle Quiz Tool pageTitle.authoring =Moodle Quiz Authoring pageTitle.admin =Moodle Quiz Configuration -admin.extToolAdapterServletUrl =External tool adapter servlet URL -admin.extServerId =External server id mapping -admin.extServerUrl =External server url +admin.enableForIntegratedServers =Enable/disable servers for this Tool Adapter admin.formError =There was an error processing the form, please ensure both fields are filled and click save again. admin.return =Return to maintain LAMS monitor.sessions =Sessions @@ -42,4 +40,5 @@ label.cancel =Cancel error.defineLater =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity. learner.percentage.grade =Moodle quiz's percentage grade + #======= End labels ===== Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.2 -r1.3 --- tool_adapters/moodle/lams_tool_mdlquiz/conf/language/lams/ApplicationResources_en_AU.properties 10 Dec 2008 22:41:02 -0000 1.2 +++ tool_adapters/moodle/lams_tool_mdlquiz/conf/language/lams/ApplicationResources_en_AU.properties 5 Jun 2009 02:17:24 -0000 1.3 @@ -11,9 +11,7 @@ activity.description =Moodle Quiz Tool pageTitle.authoring =Moodle Quiz Authoring pageTitle.admin =Moodle Quiz Configuration -admin.extToolAdapterServletUrl =External tool adapter servlet URL -admin.extServerId =External server id mapping -admin.extServerUrl =External server url +admin.enableForIntegratedServers =Enable/disable servers for this Tool Adapter admin.formError =There was an error processing the form, please ensure both fields are filled and click save again. admin.return =Return to maintain LAMS monitor.sessions =Sessions Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/language/rams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/conf/language/rams/ApplicationResources.properties,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/conf/language/rams/ApplicationResources.properties 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/conf/language/rams/ApplicationResources.properties 5 Jun 2009 02:17:24 -0000 1.2 @@ -11,9 +11,7 @@ activity.description =Moodle Quiz Tool pageTitle.authoring =Moodle Quiz Authoring pageTitle.admin =Moodle Quiz Configuration -admin.extToolAdapterServletUrl =External tool adapter servlet URL -admin.extServerId =External server id mapping -admin.extServerUrl =External server url +admin.enableForIntegratedServers =Enable/disable servers for this Tool Adapter admin.formError =There was an error processing the form, please ensure both fields are filled and click save again. admin.return =Return to maintain LAMS monitor.sessions =Sessions @@ -41,5 +39,6 @@ label.save =Save label.cancel =Cancel error.defineLater =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity. +learner.percentage.grade =Moodle quiz's percentage grade #======= End labels ===== Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/language/rams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/conf/language/rams/ApplicationResources_en_AU.properties,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/conf/language/rams/ApplicationResources_en_AU.properties 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/conf/language/rams/ApplicationResources_en_AU.properties 5 Jun 2009 02:17:24 -0000 1.2 @@ -11,9 +11,7 @@ activity.description =Moodle Quiz Tool pageTitle.authoring =Moodle Quiz Authoring pageTitle.admin =Moodle Quiz Configuration -admin.extToolAdapterServletUrl =External tool adapter servlet URL -admin.extServerId =External server id mapping -admin.extServerUrl =External server url +admin.enableForIntegratedServers =Enable/disable servers for this Tool Adapter admin.formError =There was an error processing the form, please ensure both fields are filled and click save again. admin.return =Return to maintain LAMS monitor.sessions =Sessions @@ -41,5 +39,6 @@ label.save =Save label.cancel =Cancel error.defineLater =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity. +learner.percentage.grade =Moodle quiz's percentage grade #======= End labels ===== Index: tool_adapters/moodle/lams_tool_mdlquiz/db/sql/create_lams_tool_mdlQuiz.sql =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/db/sql/create_lams_tool_mdlQuiz.sql,v diff -u -r1.2 -r1.3 --- tool_adapters/moodle/lams_tool_mdlquiz/db/sql/create_lams_tool_mdlQuiz.sql 3 Dec 2008 01:13:35 -0000 1.2 +++ tool_adapters/moodle/lams_tool_mdlquiz/db/sql/create_lams_tool_mdlQuiz.sql 5 Jun 2009 02:17:25 -0000 1.3 @@ -1,35 +1,15 @@ -- CVS ID: $Id$ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_mdquiz10_configuration; drop table if exists tl_mdquiz10_mdlquiz; drop table if exists tl_mdquiz10_session; drop table if exists tl_mdquiz10_user; -create table tl_mdquiz10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))TYPE=InnoDB; -create table tl_mdquiz10_mdlquiz (uid bigint not null auto_increment, create_date datetime, update_date datetime, define_later bit, content_in_use bit, run_offline bit, tool_content_id bigint, ext_tool_content_id bigint, ext_user_name varchar(255), ext_course_id varchar(255), ext_section varchar(255), primary key (uid))TYPE=InnoDB; +create table tl_mdquiz10_mdlquiz (uid bigint not null auto_increment, create_date datetime, update_date datetime, define_later bit, content_in_use bit, run_offline bit, tool_content_id bigint, ext_tool_content_id bigint, ext_user_name varchar(255), ext_lms_id varchar(255), ext_course_id varchar(255), ext_section varchar(255), primary key (uid))TYPE=InnoDB; create table tl_mdquiz10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, ext_session_id bigint, session_name varchar(250), mdlQuiz_uid bigint, primary key (uid))TYPE=InnoDB; create table tl_mdquiz10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, mdlquiz_session_uid bigint, entry_uid bigint, primary key (uid))TYPE=InnoDB; alter table tl_mdquiz10_session add index FKmdquiz10_session (mdlQuiz_uid), add constraint FKmdquiz10_session foreign key (mdlQuiz_uid) references tl_mdquiz10_mdlquiz (uid); alter table tl_mdquiz10_user add index FKmdquiz10_user (mdlquiz_session_uid), add constraint FKmdquiz10_user foreign key (mdlquiz_session_uid) references tl_mdquiz10_session (uid); -INSERT INTO tl_mdquiz10_configuration ( - config_key, - config_value -) -VALUES( - "toolAdapterServlet", - "http://localhost:8000/lams2conf/tooladapter_mdquiz10" -); - -INSERT INTO tl_mdquiz10_configuration ( - config_key, - config_value -) -VALUES( - "extServerUrl", - "http://localhost/moodle19/" -); - INSERT INTO tl_mdquiz10_mdlquiz ( tool_content_id, ext_tool_content_id, Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.xml,v diff -u -r1.2 -r1.3 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.xml 27 Mar 2009 18:29:08 -0000 1.2 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.xml 5 Jun 2009 02:17:25 -0000 1.3 @@ -19,10 +19,9 @@ - - + @@ -56,10 +55,6 @@ - - - - Fisheye: Tag 1.2 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/dao/IMdlQuizConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/dao/hibernate/MdlQuizConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/model/MdlQuiz.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/model/MdlQuiz.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/model/MdlQuiz.java 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/model/MdlQuiz.java 5 Jun 2009 02:17:24 -0000 1.2 @@ -49,6 +49,7 @@ private static final String CUSTOM_CSV_MAP_PARAM_USER = "user"; private static final String CUSTOM_CSV_MAP_PARAM_COURSE = "course"; private static final String CUSTOM_CSV_MAP_PARAM_SECTION = "section"; + private static final String CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID = "extlmsid"; // Fields /** @@ -66,6 +67,7 @@ private String extUsername; private String extCourseId; private String extSection; + private String extLmsId; //*********** NON Persistent fields private IToolContentHandler toolContentHandler; @@ -228,10 +230,18 @@ this.extSection = extSection; } - public static long getSerialVersionUID() { - return serialVersionUID; + /** + * @hibernate.property column="ext_lms_id" length="255" + * @return + */ + public String getExtLmsId() { + return extLmsId; } + public void setExtLmsId(String extLmsId) { + this.extLmsId = extLmsId; + } + /** * @hibernate.set lazy="true" inverse="true" cascade="none" * @hibernate.collection-key column="mdlquiz_uid" @@ -317,5 +327,6 @@ this.extUsername = params.get(CUSTOM_CSV_MAP_PARAM_USER); this.extCourseId = params.get(CUSTOM_CSV_MAP_PARAM_COURSE); this.extSection = params.get(CUSTOM_CSV_MAP_PARAM_SECTION); + this.extLmsId = params.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID); } } Fisheye: Tag 1.2 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/model/MdlQuizConfigItem.java'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/service/IMdlQuizService.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/service/IMdlQuizService.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/service/IMdlQuizService.java 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/service/IMdlQuizService.java 5 Jun 2009 02:17:24 -0000 1.2 @@ -25,10 +25,11 @@ package org.lamsfoundation.lams.tool.mdquiz.service; import java.util.HashMap; +import java.util.List; import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuiz; -import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizConfigItem; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizSession; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizUser; import org.lamsfoundation.lams.tool.mdquiz.util.MdlQuizException; @@ -96,22 +97,7 @@ public void saveOrUpdateMdlQuizSession(MdlQuizSession mdlQuizSession); /** - * Get the mdlQuiz config item by key * - * @param key - * @return - */ - public MdlQuizConfigItem getConfigItem(String key); - - /** - * Save a mdl configItem - * - * @param item - */ - public void saveOrUpdateMdlQuizConfigItem(MdlQuizConfigItem item); - - /** - * * @param userId * @param toolSessionId * @return @@ -126,13 +112,6 @@ public MdlQuizUser getUserByUID(Long uid); /** - * Gets the external organisation map for this tool adapter - * - * @return - */ - public ExtServerOrgMap getExtServerOrgMap(); - - /** * Creates a hash for talking to the external server * * @param serverMap @@ -186,8 +165,8 @@ /** * Constructs a parameter hashmap to be used for the default parameters * required by the external LMS tool adapter servlet. For instance in - * mdlQuiz, this constructs the following: - * { ["un", username], ["cs", course], ["ts", timestamp], ["hs", hash], } + * mdlQuiz, this constructs the following: { ["un", username], ["cs", + * course], ["ts", timestamp], ["hs", hash], } * * @param mdlQuiz * @return @@ -197,12 +176,42 @@ /** * Constructs a parameter hashmap based off customCSV to be used for the * default parameters required by the external LMS tool adapter servlet. For - * instance in mdlQuiz, this constructs the following: - * { ["un", username], ["cs", course], ["ts", timestamp], ["hs", hash], } + * instance in mdlQuiz, this constructs the following: { ["un", username], + * ["cs", course], ["ts", timestamp], ["hs", hash], } * * @param user * @param course * @return */ public HashMap getRequiredExtServletParams(String customCSV); + + /** + * Gets a list of all external servers + * + * @return + */ + public List getExtServerList(); + + /** + * Gets a list of servers mapped to this tool adapter + * + * @return + */ + public List getMappedServers(); + + /** + * Save all the mapped servers + * + * @param mappableServers + */ + public void saveServerMappings(String[] mappableServers); + + /** + * Gets an external server url given the extLmsId + * + * @param extLmsId + * @return + */ + public String getExtServerUrl(String extLmsId); + } Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/service/MdlQuizService.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/service/MdlQuizService.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/service/MdlQuizService.java 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/service/MdlQuizService.java 5 Jun 2009 02:17:24 -0000 1.2 @@ -36,8 +36,10 @@ import java.net.URLEncoder; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.Hashtable; import java.util.List; +import java.util.Set; import java.util.SortedMap; import org.apache.log4j.Logger; @@ -51,14 +53,15 @@ import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy; import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.integration.UserInfoFetchException; import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolAdapterContentManager; import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -68,12 +71,10 @@ import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.SessionDataExistsException; import org.lamsfoundation.lams.tool.exception.ToolException; -import org.lamsfoundation.lams.tool.mdquiz.dao.IMdlQuizConfigItemDAO; import org.lamsfoundation.lams.tool.mdquiz.dao.IMdlQuizDAO; import org.lamsfoundation.lams.tool.mdquiz.dao.IMdlQuizSessionDAO; import org.lamsfoundation.lams.tool.mdquiz.dao.IMdlQuizUserDAO; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuiz; -import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizConfigItem; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizSession; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizUser; import org.lamsfoundation.lams.tool.mdquiz.util.MdlQuizConstants; @@ -85,8 +86,6 @@ import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.HashUtil; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; /** * An implementation of the IMdlQuizService interface. @@ -103,6 +102,7 @@ public static final String CUSTOM_CSV_MAP_PARAM_USER = "user"; public static final String CUSTOM_CSV_MAP_PARAM_COURSE = "course"; public static final String CUSTOM_CSV_MAP_PARAM_SECTION = "section"; + public static final String CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID = "extlmsid"; public static final String EXT_SERVER_PARAM_USER = "un"; public static final String EXT_SERVER_PARAM_COURSE = "cs"; @@ -114,7 +114,7 @@ public static final String EXT_SERVER_PARAM_UPLOAD_FILE = "upload_file"; public static final String EXT_SERVER_PARAM_OUTPUT_NAME = "oname"; - private static final int EXPECTED_CSV_SIZE = 3; + private static final int EXPECTED_CSV_SIZE = 4; private static final String EXPECTED_CSV_FORM = "user,course"; private IMdlQuizDAO mdlQuizDAO = null; @@ -123,8 +123,6 @@ private IMdlQuizUserDAO mdlQuizUserDAO = null; - private IMdlQuizConfigItemDAO mdlQuizConfigItemDAO = null; - private ILearnerService learnerService; private ILamsToolService toolService; @@ -184,8 +182,7 @@ */ public Long copyExternalToolContent(HashMap params) throws ToolException, Exception { - String cloneServletUrl = mdlQuizConfigItemDAO.getConfigItemByKey(MdlQuizConfigItem.KEY_EXTERNAL_TOOL_SERVLET) - .getConfigValue(); + String cloneServletUrl = getExtToolAdapterServletUrl(params.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); // add the method to the params params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_CLONE); @@ -207,11 +204,12 @@ params.put(EXT_SERVER_PARAM_COURSE, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_COURSE)); params.put(EXT_SERVER_PARAM_USER, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_USER)); params.put(EXT_SERVER_PARAM_SECTION, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_SECTION)); + params.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); String timestamp = Long.toString(new Date().getTime()); params.put(EXT_SERVER_PARAM_TIMESTAMP, timestamp); - ExtServerOrgMap serverMap = this.getExtServerOrgMap(); + ExtServerOrgMap serverMap = getExtServerOrgMap(paramsCSV.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); String hash = hash(serverMap, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_USER), timestamp); params.put(EXT_SERVER_PARAM_HASH, hash); @@ -223,11 +221,12 @@ params.put(EXT_SERVER_PARAM_USER, mdlquiz.getExtUsername()); params.put(EXT_SERVER_PARAM_COURSE, mdlquiz.getExtCourseId()); params.put(EXT_SERVER_PARAM_SECTION, mdlquiz.getExtSection()); + params.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, mdlquiz.getExtLmsId()); String timestamp = Long.toString(new Date().getTime()); params.put(EXT_SERVER_PARAM_TIMESTAMP, timestamp); - ExtServerOrgMap serverMap = this.getExtServerOrgMap(); + ExtServerOrgMap serverMap = getExtServerOrgMap(mdlquiz.getExtLmsId()); String hash = hash(serverMap, mdlquiz.getExtUsername(), timestamp); params.put(EXT_SERVER_PARAM_HASH, hash); @@ -244,6 +243,7 @@ map.put(CUSTOM_CSV_MAP_PARAM_USER, split[0]); map.put(CUSTOM_CSV_MAP_PARAM_COURSE, split[1]); map.put(CUSTOM_CSV_MAP_PARAM_SECTION, split[2]); + map.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, split[3]); return map; } else { return null; @@ -253,13 +253,12 @@ public int getExternalToolOutputInt(String outputName, MdlQuiz mdlQuiz, Long userId, String extToolContentId, Long toolSessionId) { MdlQuizUser user = this.getUserByUserIdAndSessionId(userId, toolSessionId); - ExtServerOrgMap extServerMap = getExtServerOrgMap(); + ExtServerOrgMap extServerMap = getExtServerOrgMap(mdlQuiz.getExtLmsId()); String extUserName = user.getLoginName().substring(extServerMap.getPrefix().length() + 1); try { - String outputServletUrl = mdlQuizConfigItemDAO.getConfigItemByKey( - MdlQuizConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String outputServletUrl = getExtToolAdapterServletUrl(mdlQuiz.getExtLmsId()); // setting the mdlQuiz username so the params are set up correctly mdlQuiz.setExtUsername(extUserName); @@ -330,6 +329,27 @@ return mdlQuizOutputFactory.getToolOutputDefinitions(mdquiz); } + public String getExtServerUrl(String extLmsId) { + ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(extLmsId); + String ret = null; + if (serverMap != null) { + ret = serverMap.getServerUrl(); + } + return ret; + } + + public String getExtToolAdapterServletUrl(String extLmsId) { + String ret = getExtServerUrl(extLmsId); + if (ret != null) { + ret += MdlQuizConstants.RELATIVE_SERVLET_URL; + } + return ret; + } + + public ExtServerOrgMap getExtServerOrgMap(String extLmsId) { + return integrationService.getExtServerOrgMap(extLmsId); + } + public String hash(ExtServerOrgMap serverMap, String extUsername, String timestamp) { String serverId = serverMap.getServerid(); String serverKey = serverMap.getServerkey(); @@ -381,25 +401,6 @@ fromContent = getDefaultContent(); } MdlQuiz toContent = MdlQuiz.newInstance(fromContent, toContentId, mdlQuizToolContentHandler); - - // calling the external tool to copy it's content. - /* - try - { - - toContent.setExtToolContentId(copyExternalToolContent( - fromContent.getExtToolContentId(), - fromContent.getExtUsername(), - fromContent.getExtCourseId(), - fromContent.getExtCourseUrl() - )); - - } - catch(Exception e) - { - throw new ToolException("Failed to call external server to copy tool content" + e); - }*/ - mdlQuizDAO.saveOrUpdate(toContent); } @@ -442,7 +443,7 @@ if ((fromContent == null) || fromContent.getExtToolContentId() == null) { // create the fromContent using the default tool content - fromContent = getDefaultContent(); + fromContent = getDefaultContent(params.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); try { // notify the external server to create the default content params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, "0"); @@ -530,36 +531,38 @@ String toolPath = FileUtil.getFullPath(rootPath, toolContentId.toString()); FileUtil.createDirectory(toolPath); - String exportServletUrl = mdlQuizConfigItemDAO.getConfigItemByKey( - MdlQuizConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String exportServletUrl = getExtToolAdapterServletUrl(mdlQuiz.getExtLmsId()); - // setting these to arbitrary values since they are only used to construct the hash + if (exportServletUrl != null) { + // setting these to arbitrary values since they are only used to construct the hash + mdlQuiz.setExtCourseId("extCourse"); + mdlQuiz.setExtSection("0"); + mdlQuiz.setExtUsername("authUser"); + HashMap params = this.getRequiredExtServletParams(mdlQuiz); + params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); + params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlQuiz.getExtToolContentId().toString()); - mdlQuiz.setExtCourseId("extCourse"); - mdlQuiz.setExtSection("0"); - mdlQuiz.setExtUsername("authUser"); - HashMap params = this.getRequiredExtServletParams(mdlQuiz); - params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); - params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlQuiz.getExtToolContentId().toString()); + // Get the reponse stream from the external server (hopefully containing the export file + InputStream in = WebUtility.getResponseInputStreamFromExternalServer(exportServletUrl, params); - // Get the reponse stream from the external server (hopefully containing the export file - InputStream in = WebUtility.getResponseInputStreamFromExternalServer(exportServletUrl, params); + // Get the output stream to write the file for extport + OutputStream out = new BufferedOutputStream(new FileOutputStream(toolPath + "/ext_tool.txt")); - // Get the output stream to write the file for extport - OutputStream out = new BufferedOutputStream(new FileOutputStream(toolPath + "/ext_tool.txt")); + byte[] buffer = new byte[1024]; + int numRead; + long numWritten = 0; + while ((numRead = in.read(buffer)) != -1) { + out.write(buffer, 0, numRead); + numWritten += numRead; + } + logger.debug("Path to mdlQuiz export content: " + toolPath + "/ext_tool.txt"); - byte[] buffer = new byte[1024]; - int numRead; - long numWritten = 0; - while ((numRead = in.read(buffer)) != -1) { - out.write(buffer, 0, numRead); - numWritten += numRead; + out.flush(); + out.close(); + in.close(); + } else { + exportContentService.exportToolContent(toolContentId, mdlQuiz, mdlQuizToolContentHandler, rootPath); } - logger.debug("Path to mdlQuiz export content: " + toolPath + "/ext_tool.txt"); - - out.flush(); - out.close(); - in.close(); } catch (Exception e) { logger.error("Problem exporting data from external .LRN servlet", e); } @@ -575,13 +578,6 @@ } - public ExtServerOrgMap getExtServerOrgMap() { - if (integrationService == null) - integrationService = getIntegrationService(); - IToolVO tool = toolService.getToolBySignature(MdlQuizConstants.TOOL_SIGNATURE); - return integrationService.getExtServerOrgMap(tool.getExtLmsId()); - } - /** * Import the XML fragment for the tool's content, along with any files * needed for the content. @@ -599,10 +595,6 @@ if (extExportFile.exists()) { try { - - String importServletUrl = mdlQuizConfigItemDAO.getConfigItemByKey( - MdlQuizConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); - if (customCSV == null) { logger.error("Could not retrieve customCSV required for importing tool adapter tool. CustomCSV: " + customCSV); @@ -611,6 +603,9 @@ + customCSV); } + HashMap customCSVMap = decodeCustomCSV(customCSV); + String importServletUrl = getExtToolAdapterServletUrl(customCSVMap.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); + HashMap params = getRequiredExtServletParams(customCSV); params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_IMPORT); @@ -666,17 +661,13 @@ } public MdlQuiz getDefaultContent() { - /* - Long defaultContentID = getDefaultContentIdBySignature(MdlQuizConstants.TOOL_SIGNATURE); - MdlQuiz defaultContent = getMdlQuizByContentId(defaultContentID); - if (defaultContent == null) { - String error = "Could not retrieve default content record for this tool"; - logger.error(error); - throw new MdlQuizException(error); - } + MdlQuiz defaultContent = new MdlQuiz(); return defaultContent; - */ + } + + public MdlQuiz getDefaultContent(String extLmsId) { MdlQuiz defaultContent = new MdlQuiz(); + defaultContent.setExtLmsId(extLmsId); return defaultContent; } @@ -696,6 +687,57 @@ return newContent; } + @SuppressWarnings("unchecked") + public List getExtServerList() { + if (integrationService.getAllExtServerOrgMaps() != null) { + return (List) integrationService.getAllExtServerOrgMaps(); + } else { + return null; + } + + } + + public List getMappedServers() { + return integrationService.getMappedServers(MdlQuizConstants.TOOL_SIGNATURE); + } + + public void saveServerMappings(String[] mappedServers) { + Tool tool = toolService.getPersistToolBySignature(MdlQuizConstants.TOOL_SIGNATURE); + + Set mappedAdapterServers = new HashSet(); + + List alreadyMapped = getMappedServers(); + + if (tool != null) { + if (mappedServers != null) { + + for (int i = 0; i < mappedServers.length; i++) { + + ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(mappedServers[i]); + + if (serverMap != null) { + + ExtServerToolAdapterMap serverToolMap = integrationService.getMappedServer(serverMap + .getServerid(), MdlQuizConstants.TOOL_SIGNATURE); + + if (serverToolMap == null) { + serverToolMap = new ExtServerToolAdapterMap(tool, serverMap); + integrationService.saveExtServerToolAdapterMap(serverToolMap); + } + mappedAdapterServers.add(serverToolMap); + } + } + } + } + + for (ExtServerToolAdapterMap map : alreadyMapped) { + if (!mappedAdapterServers.contains(map)) { + integrationService.deleteExtServerToolAdapterMap(map); + } + } + + } + public MdlQuiz getMdlQuizByContentId(Long toolContentID) { MdlQuiz mdlQuiz = (MdlQuiz) mdlQuizDAO.getByContentId(toolContentID); if (mdlQuiz == null) { @@ -704,14 +746,6 @@ return mdlQuiz; } - public MdlQuizConfigItem getConfigItem(String key) { - return mdlQuizConfigItemDAO.getConfigItemByKey(key); - } - - public void saveOrUpdateMdlQuizConfigItem(MdlQuizConfigItem item) { - mdlQuizConfigItemDAO.saveOrUpdate(item); - } - public MdlQuizSession getSessionBySessionId(Long toolSessionId) { MdlQuizSession mdlQuizSession = mdlQuizSessionDAO.getBySessionId(toolSessionId); if (mdlQuizSession == null) { @@ -841,14 +875,6 @@ this.mdlQuizDAO = mdlQuizDAO; } - public IMdlQuizConfigItemDAO getMdlQuizConfigItemDAO() { - return mdlQuizConfigItemDAO; - } - - public void setMdlQuizConfigItemDAO(IMdlQuizConfigItemDAO mdlQuizConfigItemDAO) { - this.mdlQuizConfigItemDAO = mdlQuizConfigItemDAO; - } - public IToolContentHandler getMdlQuizToolContentHandler() { return mdlQuizToolContentHandler; } @@ -915,35 +941,9 @@ public void setMdlQuizOutputFactory(MdlQuizOutputFactory mdlQuizOutputFactory) { this.mdlQuizOutputFactory = mdlQuizOutputFactory; } - - /** - * TODO: Use spring injection instead of hacking a context - * - * @return - */ + public IIntegrationService getIntegrationService() { - - if (integrationService == null) { - String contexts[] = { "/org/lamsfoundation/lams/applicationContext.xml", - "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", - "/org/lamsfoundation/lams/toolApplicationContext.xml", - "/org/lamsfoundation/lams/integrationContext.xml", - "/org/lamsfoundation/lams/learning/learningApplicationContext.xml", - "/org/lamsfoundation/lams/contentrepository/applicationContext.xml", - "/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.xml", - "/org/lamsfoundation/lams/commonContext.xml" }; - - ApplicationContext context = new ClassPathXmlApplicationContext(contexts); - - if (context == null) - throw new MdlQuizException( - "Unable to access application context. Cannot create integration service object."); - - IIntegrationService service = (IIntegrationService) context.getBean("integrationService"); - return service; - } else { - return integrationService; - } + return integrationService; } public void setIntegrationService(IIntegrationService integrationService) { Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/util/MdlQuizConstants.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/util/MdlQuizConstants.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/util/MdlQuizConstants.java 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/util/MdlQuizConstants.java 5 Jun 2009 02:17:24 -0000 1.2 @@ -47,4 +47,6 @@ public static final String PARAM_PARENT_PAGE = "parentPage"; static final String FILTER_REPLACE_TEXT = "***"; + + public static final String RELATIVE_SERVLET_URL = "mod/lamstwo/tooladapter_quiz.php"; } Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/util/WebUtility.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/util/WebUtility.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/util/WebUtility.java 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/util/WebUtility.java 5 Jun 2009 02:17:24 -0000 1.2 @@ -35,10 +35,10 @@ import java.net.URLConnection; import java.util.HashMap; import java.util.Map.Entry; -import java.util.Set; import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.exception.ToolException; +import org.lamsfoundation.lams.tool.mdquiz.service.MdlQuizService; public class WebUtility { static Logger logger = Logger.getLogger(WebUtility.class.getName()); @@ -149,7 +149,9 @@ urlStr += "?"; for (Entry entry : params.entrySet()) { - urlStr += "&" + entry.getKey() + "=" + entry.getValue(); + if (!entry.getKey().equals(MdlQuizService.CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)) { + urlStr += "&" + entry.getKey() + "=" + entry.getValue(); + } } logger.debug("Making request to external servlet: " + urlStr); Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/AdminAction.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/AdminAction.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/AdminAction.java 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/AdminAction.java 5 Jun 2009 02:17:24 -0000 1.2 @@ -23,17 +23,19 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mdquiz.web.actions; +import java.util.ArrayList; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.tool.Tool; -import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizConfigItem; +import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.tool.mdquiz.service.IMdlQuizService; import org.lamsfoundation.lams.tool.mdquiz.service.MdlQuizServiceProxy; -import org.lamsfoundation.lams.tool.mdquiz.util.MdlQuizConstants; import org.lamsfoundation.lams.tool.mdquiz.web.forms.AdminForm; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.web.action.LamsDispatchAction; @@ -60,56 +62,53 @@ AdminForm adminForm = (AdminForm) form; - if (toolService == null) { - toolService = mdlQuizService.getToolService(); - } - Tool tool = toolService.getPersistToolBySignature(MdlQuizConstants.TOOL_SIGNATURE); + // Get a list of possible external servers to enable this tool for + List serverList = mdlQuizService.getExtServerList(); + List mappedServers = mdlQuizService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - MdlQuizConfigItem toolAdpServlet = mdlQuizService.getConfigItem(MdlQuizConfigItem.KEY_EXTERNAL_TOOL_SERVLET); - if (toolAdpServlet != null) - adminForm.setToolAdapterServlet(toolAdpServlet.getConfigValue()); - - MdlQuizConfigItem extServerConfig = mdlQuizService.getConfigItem(MdlQuizConfigItem.KEY_EXTERNAL_SERVER_URL); - if (extServerConfig != null) - adminForm.setExtServerUrl(extServerConfig.getConfigValue()); - - if (tool != null && tool.getExtLmsId() != null) - adminForm.setServerIdMapping(tool.getExtLmsId()); - request.setAttribute("error", false); return mapping.findForward("config"); } + public void populateServerList(AdminForm adminForm, List serverList, + List mappedServers) { + ArrayList mappableServers = new ArrayList(); + ArrayList mappedServersInForm = new ArrayList(); + + if (serverList != null) { + for (ExtServerOrgMap serverMap : serverList) { + mappableServers.add(serverMap.getServerid().toString()); + if (mappedServers != null) { + for (ExtServerToolAdapterMap mappedServer : mappedServers) { + if (mappedServer.getExtServer().getServerid().equals(serverMap.getServerid())) { + mappedServersInForm.add(serverMap.getServerid().toString()); + } + } + } + } + } + adminForm.setMappableServers((String[]) mappableServers.toArray(new String[mappableServers.size()])); + adminForm.setMappedServers((String[]) mappedServersInForm.toArray(new String[mappedServersInForm.size()])); + } + public ActionForward saveContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { AdminForm adminForm = (AdminForm) form; - if (adminForm.getToolAdapterServlet() != null && !adminForm.getToolAdapterServlet().equals("") - && adminForm.getServerIdMapping() != null && !adminForm.getServerIdMapping().equals("") - && adminForm.getExtServerUrl() != null && !adminForm.getExtServerUrl().equals("")) { - // set up mdlQuizService - if (mdlQuizService == null) { - mdlQuizService = MdlQuizServiceProxy.getMdlQuizService(this.getServlet().getServletContext()); - } + // set up mdlQuizService + if (mdlQuizService == null) { + mdlQuizService = MdlQuizServiceProxy.getMdlQuizService(this.getServlet().getServletContext()); + } + // Save all the mappings + mdlQuizService.saveServerMappings(adminForm.getMappedServers()); - MdlQuizConfigItem servletConfig = mdlQuizService.getConfigItem(MdlQuizConfigItem.KEY_EXTERNAL_TOOL_SERVLET); - servletConfig.setConfigValue(adminForm.getToolAdapterServlet()); - mdlQuizService.saveOrUpdateMdlQuizConfigItem(servletConfig); + // Get a list of possible external servers to enable this tool for + List serverList = mdlQuizService.getExtServerList(); + List mappedServers = mdlQuizService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - MdlQuizConfigItem extServerConfig = mdlQuizService.getConfigItem(MdlQuizConfigItem.KEY_EXTERNAL_SERVER_URL); - extServerConfig.setConfigValue(adminForm.getExtServerUrl()); - mdlQuizService.saveOrUpdateMdlQuizConfigItem(extServerConfig); + return mapping.findForward("config"); - if (toolService == null) { - toolService = mdlQuizService.getToolService(); - } - Tool tool = toolService.getPersistToolBySignature(MdlQuizConstants.TOOL_SIGNATURE); - tool.setExtLmsId(adminForm.getServerIdMapping()); - toolService.saveOrUpdateTool(tool); - return mapping.findForward("config"); - } else { - request.setAttribute("error", true); - return mapping.findForward("config"); - } } } Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/AuthoringAction.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/AuthoringAction.java 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/AuthoringAction.java 5 Jun 2009 02:17:24 -0000 1.2 @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuiz; -import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizConfigItem; import org.lamsfoundation.lams.tool.mdquiz.service.IMdlQuizService; import org.lamsfoundation.lams.tool.mdquiz.service.MdlQuizServiceProxy; import org.lamsfoundation.lams.tool.mdquiz.util.MdlQuizConstants; @@ -107,19 +106,21 @@ String userFromCSV = null; String courseFromCSV = null; String sectionFromCSV = null; + String extLmsIdFromCSV = null; if (customCSV == null && mdlQuiz == null) { logger.error("CustomCSV required if mdlQuiz is null"); throw new ToolException("CustomCSV required if mdlQuiz is null"); } else if (customCSV != null) { String splitCSV[] = customCSV.split(","); - if (splitCSV.length != 3) { + if (splitCSV.length != 4) { logger.error("mdlQuiz tool customCSV not in required (user,course,courseURL) form: " + customCSV); throw new ToolException("mdlQuiz tool cusomCSV not in required (user,course,courseURL) form: " + customCSV); } else { userFromCSV = splitCSV[0]; courseFromCSV = splitCSV[1]; sectionFromCSV = splitCSV[2]; + extLmsIdFromCSV = splitCSV[3]; } } @@ -128,9 +129,18 @@ mdlQuiz.setExtUsername(userFromCSV); mdlQuiz.setExtCourseId(courseFromCSV); mdlQuiz.setExtSection(sectionFromCSV); + mdlQuiz.setExtLmsId(extLmsIdFromCSV); mdlQuiz.setCreateDate(new Date()); } + if (mdlQuiz.getExtLmsId() == null) { + mdlQuiz.setExtUsername(userFromCSV); + mdlQuiz.setExtCourseId(courseFromCSV); + mdlQuiz.setExtSection(sectionFromCSV); + mdlQuiz.setExtLmsId(extLmsIdFromCSV); + mdlQuiz.setCreateDate(new Date()); + } + if (mode != null && mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we @@ -143,26 +153,20 @@ try { // If the mdlQuiz has a saved course url, use it, otherwise use the one giving in the request in customCSV - //String courseUrlToBeUsed = (mdlQuiz.getExtCourseUrl() != null) ? mdlQuiz.getExtCourseUrl() : courseUrlFromCSV; + String responseUrl = mdlQuizService.getExtServerUrl(mdlQuiz.getExtLmsId()); - String responseUrl = mdlQuizService.getConfigItem(MdlQuizConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); - - - responseUrl += RELATIVE_MOODLE_AUTHOR_URL; String returnUpdateUrl = URLEncoder.encode(TOOL_APP_URL + "/authoring.do?dispatch=updateContent" + "&" + AttributeNames.PARAM_TOOL_CONTENT_ID + "=" + toolContentID.toString(), "UTF8"); - - + returnUpdateUrl = URLEncoder.encode(returnUpdateUrl, "UTF8"); - + responseUrl += "lamsUpdateURL=" + returnUpdateUrl; - + String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_EDIT_URL, "UTF8"); - - responseUrl += "&dest=" + encodedMoodleRelativePath ; + responseUrl += "&dest=" + encodedMoodleRelativePath; + if (mdlQuiz.getExtSection() != null) { responseUrl += "§ion=" + mdlQuiz.getExtSection(); } else { Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/LearningAction.java,v diff -u -r1.2 -r1.3 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/LearningAction.java 10 Dec 2008 22:47:51 -0000 1.2 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/LearningAction.java 5 Jun 2009 02:17:24 -0000 1.3 @@ -34,19 +34,18 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.ToolSessionManager; +import org.lamsfoundation.lams.tool.exception.DataMissingException; +import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.mdquiz.dto.MdlQuizDTO; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuiz; -import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizConfigItem; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizSession; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizUser; -import org.lamsfoundation.lams.tool.mdquiz.service.MdlQuizServiceProxy; import org.lamsfoundation.lams.tool.mdquiz.service.IMdlQuizService; +import org.lamsfoundation.lams.tool.mdquiz.service.MdlQuizServiceProxy; import org.lamsfoundation.lams.tool.mdquiz.util.MdlQuizConstants; import org.lamsfoundation.lams.tool.mdquiz.util.MdlQuizException; -import org.lamsfoundation.lams.tool.exception.DataMissingException; -import org.lamsfoundation.lams.tool.exception.ToolException; -import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; @@ -77,7 +76,7 @@ public static final String RELATIVE_LEARNER_URL = "course/lamsframes.php?"; public static final String MOODLE_VIEW_URL = "mod/quiz/view.php"; public static final String RELATIVE_TEACHER_URL = "mod/quiz/report.php?"; - + private IMdlQuizService mdlQuizService; public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, @@ -87,7 +86,7 @@ // 'toolSessionID' and 'mode' paramters are expected to be present. // TODO need to catch exceptions and handle errors. - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, false); + ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, false); Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); @@ -126,28 +125,24 @@ if (mdlQuiz.getExtToolContentId() != null) { try { - String responseUrl = mdlQuizService.getConfigItem(MdlQuizConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); - - if(mode.equals(ToolAccessMode.TEACHER)) - { - responseUrl += RELATIVE_TEACHER_URL; + String responseUrl = mdlQuizService.getExtServerUrl(mdlQuiz.getExtLmsId()); + + if (mode.equals(ToolAccessMode.TEACHER)) { + responseUrl += RELATIVE_TEACHER_URL; + } else if (mode.equals(ToolAccessMode.LEARNER) || mode.equals(ToolAccessMode.AUTHOR)) { + responseUrl += RELATIVE_LEARNER_URL; } - else if (mode.equals(ToolAccessMode.LEARNER)|| mode.equals(ToolAccessMode.AUTHOR)) - { - responseUrl += RELATIVE_LEARNER_URL; - } - + String returnUrl = TOOL_APP_URL + "learning.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "=" + toolSessionID.toString() + "&dispatch=finishActivity"; - + String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_VIEW_URL, "UTF8"); returnUrl = URLEncoder.encode(returnUrl, "UTF8"); - - responseUrl += "&id=" + mdlQuizSession.getExtSessionId() + "&returnUrl=" + returnUrl - + "&dest=" + encodedMoodleRelativePath + "&is_learner=1" + "&isFinished=" + mdlQuizUser.isFinishedActivity(); + responseUrl += "&id=" + mdlQuizSession.getExtSessionId() + "&returnUrl=" + returnUrl + "&dest=" + + encodedMoodleRelativePath + "&is_learner=1" + "&isFinished=" + + mdlQuizUser.isFinishedActivity(); log.debug("Redirecting for mdl quiz learner: " + responseUrl); response.sendRedirect(responseUrl); Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/MonitoringAction.java,v diff -u -r1.2 -r1.3 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/MonitoringAction.java 12 Jan 2009 05:38:08 -0000 1.2 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/actions/MonitoringAction.java 5 Jun 2009 02:17:24 -0000 1.3 @@ -37,7 +37,6 @@ import org.lamsfoundation.lams.tool.mdquiz.dto.MdlQuizDTO; import org.lamsfoundation.lams.tool.mdquiz.dto.MdlQuizSessionDTO; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuiz; -import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizConfigItem; import org.lamsfoundation.lams.tool.mdquiz.service.IMdlQuizService; import org.lamsfoundation.lams.tool.mdquiz.service.MdlQuizServiceProxy; import org.lamsfoundation.lams.tool.mdquiz.util.MdlQuizConstants; @@ -90,15 +89,15 @@ for (MdlQuizSessionDTO sessionDTO : mdlQuizDT0.getSessionDTOs()) { try { - String responseUrl = mdlQuizService.getConfigItem(MdlQuizConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); + String responseUrl = mdlQuizService.getExtServerUrl(mdlQuiz.getExtLmsId()); responseUrl += RELATIVE_MONITOR_URL; String returnUrl = TOOL_APP_URL + "learning.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "=" + sessionDTO.getSessionID().toString() + "&dispatch=finishActivity"; returnUrl = URLEncoder.encode(returnUrl, "UTF8"); - responseUrl += "&update=" + sessionDTO.getExtSessionID()+"&id=" + sessionDTO.getExtSessionID() + "&returnUrl=" + returnUrl; + responseUrl += "&update=" + sessionDTO.getExtSessionID() + "&id=" + sessionDTO.getExtSessionID() + + "&returnUrl=" + returnUrl; sessionDTO.setRunTimeUrl(responseUrl); } catch (UnsupportedEncodingException e) { Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/forms/AdminForm.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/forms/AdminForm.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/forms/AdminForm.java 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/forms/AdminForm.java 5 Jun 2009 02:17:25 -0000 1.2 @@ -13,43 +13,31 @@ */ public class AdminForm extends ActionForm { private static final long serialVersionUID = 8872637862875198L; + + String[] mappableServers; + String[] mappedServers; - String toolAdapterServlet; - String extServerUrl; - String serverIdMapping; - @Override public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) { ActionErrors ac = new ActionErrors(); ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error")); return ac; } - public String getToolAdapterServlet() { - return toolAdapterServlet; + public String[] getMappableServers() { + return mappableServers; } - public void setToolAdapterServlet(String toolAdapterServlet) { - this.toolAdapterServlet = toolAdapterServlet; + public void setMappableServers(String[] mappableServers) { + this.mappableServers = mappableServers; } - public String getServerIdMapping() { - return serverIdMapping; + public String[] getMappedServers() { + return mappedServers; } - public void setServerIdMapping(String serverIdMapping) { - this.serverIdMapping = serverIdMapping; + public void setMappedServers(String[] mappedServers) { + this.mappedServers = mappedServers; } - public String getExtServerUrl() { - return extServerUrl; - } - - public void setExtServerUrl(String extServerUrl) { - this.extServerUrl = extServerUrl; - } - - public static long getSerialVersionUID() { - return serialVersionUID; - } } Index: tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/servlets/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/servlets/ExportServlet.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/servlets/ExportServlet.java 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/src/java/org/lamsfoundation/lams/tool/mdquiz/web/servlets/ExportServlet.java 5 Jun 2009 02:17:25 -0000 1.2 @@ -41,10 +41,9 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.mdquiz.dto.MdlQuizDTO; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuiz; -import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizConfigItem; import org.lamsfoundation.lams.tool.mdquiz.model.MdlQuizSession; -import org.lamsfoundation.lams.tool.mdquiz.service.MdlQuizServiceProxy; import org.lamsfoundation.lams.tool.mdquiz.service.IMdlQuizService; +import org.lamsfoundation.lams.tool.mdquiz.service.MdlQuizServiceProxy; import org.lamsfoundation.lams.tool.mdquiz.util.MdlQuizException; import org.lamsfoundation.lams.tool.mdquiz.util.WebUtility; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; @@ -166,8 +165,7 @@ private void exportFileFromExternalServer(HttpServletRequest request, HttpServletResponse response, Long extToolSessionId, MdlQuiz mdlQuiz, String fullPath) throws Exception { - String exportPortFolioServletUrl = mdlQuizService.getConfigItem(MdlQuizConfigItem.KEY_EXTERNAL_TOOL_SERVLET) - .getConfigValue(); + String exportPortFolioServletUrl = mdlQuizService.getExtServerUrl(mdlQuiz.getExtLmsId()); String extUsername = "user"; // setting user to arbitrary values since they are only used to construct the hash Index: tool_adapters/moodle/lams_tool_mdlquiz/web/pages/admin/config.jsp =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlquiz/web/pages/admin/config.jsp,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlquiz/web/pages/admin/config.jsp 16 Nov 2008 22:49:33 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlquiz/web/pages/admin/config.jsp 5 Jun 2009 02:17:24 -0000 1.2 @@ -31,18 +31,22 @@ - - - - - - - - - - - - + +

+ +

+ + + + + + +
+ + + +
+