[Ils-source] r1422 - trunk/webapp/api/ccure/updatescore.vws

[scribe at crosswire.org]

Author: scribe
Date: 2016-04-06 11:58:14 -0700 (Wed, 06 Apr 2016)
New Revision: 1422

Modified:
   trunk/webapp/api/ccure/updatescore.vws/index.jsp
Log:
updated to use course.userdata to store ccure integration fieldset number
updated logging in ccure/updatescore.vws to use the aicc log as these messages are per course attempt


Modified: trunk/webapp/api/ccure/updatescore.vws/index.jsp
===================================================================
--- trunk/webapp/api/ccure/updatescore.vws/index.jsp	2016-04-06 18:48:50 UTC (rev 1421)
+++ trunk/webapp/api/ccure/updatescore.vws/index.jsp	2016-04-06 18:58:14 UTC (rev 1422)
@@ -53,36 +53,9 @@
 
 	Logger logger = Logger.getLogger(this.getClass());
 	Logger eventsLogger = Logger.getLogger("EVENTS");
+	Logger aicc = Logger.getLogger("AICC");
 
 
-	Map<String, String> courses = new HashMap<String, String>();
-	Map<String, String> courseEnums = new HashMap<String, String>();
-	int i = 1;
-	while (true) {
-		String courseName = Utils.getSysConfig(session).getProperty("CCURECourse."+i);
-		String courseEnum = Utils.getSysConfig(session).getProperty("CCURECourseEnum."+i);
-		if (courseName != null && courseEnum != null) {
-			courses.put(courseName, Integer.toString(i));
-			courseEnums.put(courseName, courseEnum);
-		}
-		else break;
-		i++;
-	}
-	// if our configuration isn't specifying course names and fields, then populate with defaults
-	if (courses.size() == 0) {
-		courses.put("Ramp Driving", "1");
-		courseEnums.put("Ramp Driving", "RAMPDRIVING");
-
-		courses.put("Airfield Driving", "2");
-		courseEnums.put("Airfield Driving", "AIRFIELDDRIVING");
-
-		courses.put("SIDA", "3");
-		courseEnums.put("SIDA", "SIDA");
-
-		courses.put("Sterile", "4");
-		courseEnums.put("Sterile", "STERILE");
-	}
-	
 	String guid = request.getParameter("userProfileUserData");
 	String userProfileID = request.getParameter("userProfileID");
 	String companyID = request.getParameter("companyID");
@@ -121,7 +94,7 @@
 
 	if (objectID != null) {
 
-		eventsLogger.debug("CCURE: objectID="+objectID+"; caCompleteDate="+caCompleteDateString+"; caStatusDesc="+caStatusDescription+"; courseName="+courseName+"; caScore="+caScore);
+		aicc.info("CCURE: updatescore.vws objectID="+objectID+"; caCompleteDate="+caCompleteDateString+"; caStatusDesc="+caStatusDescription+"; courseName="+courseName+"; caScore="+caScore);
 
 		String statusMsg = "";
 		SimpleDateFormat df  = new SimpleDateFormat("yyyy-MM-dd");
@@ -129,11 +102,9 @@
 		int personID = -1; try { personID = Integer.parseInt(objectID); } catch (Exception e) {}
 		Date caCompleteDate = new Date(); try { caCompleteDate = new SimpleDateFormat().parse(caCompleteDateString); } catch (Exception e) {}
 		String fieldName = request.getParameter("fieldSet");
-		String courseEnum  = null;
+		if (fieldName == null) fieldName = request.getParameter("courseUserData");
+		try { if (Integer.parseInt(fieldName) > 8) fieldName = null; } catch (Exception e) { fieldName = null; }
 
-		if (fieldName == null) fieldName = courses.get(courseName);
-		courseEnum = courseEnums.get(courseName);
-
 		++errCode;
 		if (personID < 0) {
 			out.print("<error code=\""+errCode+"\" message=\"You must pass a valid personID as userProfileUserData.\"/>");
@@ -156,13 +127,7 @@
 		}
 		++errCode;
 		if (fieldName == null) {
-			out.print("<error code=\""+errCode+"\" message=\"You must pass a valid Course CCURE Course Name as courseName. Valid course Names: [");
-			boolean first = true;
-			for (String cName : courses.keySet()) {
-				out.print((first?"":",") + HTTPUtils.canonize(cName));
-				first = false;
-			}
-			out.print("\"/>");
+			aicc.info("CCURE: course completed but not configured to report to CCURE");
 			return;
 		}