[Ils-source] r1428 - in branches/1.6: . webapp/api/ccure/updatescore.vws webapp/api/ccure/user/put
scribe at crosswire.org
scribe at crosswire.org
Wed Apr 6 15:30:03 MST 2016
Author: scribe
Date: 2016-04-06 15:30:02 -0700 (Wed, 06 Apr 2016)
New Revision: 1428
Modified:
branches/1.6/
branches/1.6/webapp/api/ccure/updatescore.vws/index.jsp
branches/1.6/webapp/api/ccure/user/put/index.jsp
Log:
merged in latest CCURE changes per JAX, added logging and ignore blank CrossFire records
Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424
+ /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427
Modified: branches/1.6/webapp/api/ccure/updatescore.vws/index.jsp
===================================================================
--- branches/1.6/webapp/api/ccure/updatescore.vws/index.jsp 2016-04-06 22:28:42 UTC (rev 1427)
+++ branches/1.6/webapp/api/ccure/updatescore.vws/index.jsp 2016-04-06 22:30:02 UTC (rev 1428)
@@ -65,6 +65,7 @@
String caStatusDescription = request.getParameter("statusDescription");
String courseName = request.getParameter("courseName");
String caScore = request.getParameter("score");
+ if ("-1".equals(caScore)) caScore = "0";
String objectID = request.getParameter("objectID");
Modified: branches/1.6/webapp/api/ccure/user/put/index.jsp
===================================================================
--- branches/1.6/webapp/api/ccure/user/put/index.jsp 2016-04-06 22:28:42 UTC (rev 1427)
+++ branches/1.6/webapp/api/ccure/user/put/index.jsp 2016-04-06 22:30:02 UTC (rev 1428)
@@ -13,6 +13,8 @@
<%
Logger logger = Logger.getLogger(this.getClass());
+ Logger eventsLogger = Logger.getLogger("EVENTS");
+ String errMsg = "";
// standard service header ---------------------------------------
response.setContentType("text/xml");
int errCode = 0;
@@ -21,7 +23,9 @@
boolean apiEnabled = "on".equals(Utils.getSysConfig(session.getServletContext(), company.getCompanyID()).getProperty("APIEnable", "off"));
++errCode;
if (!apiEnabled) {
- out.print("<error code=\""+errCode+"\" message=\"API not enabled in system management settings.\"/>");
+ errMsg = "API not enabled in system management settings.";
+ out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
return;
}
@@ -32,7 +36,9 @@
: (ILSSession)session.getAttribute("ilsSession");
++errCode;
if (ilsSession == null) {
- out.print("<error code=\""+errCode+"\" message=\"Your iLS sign in information is not valid.\"/>");
+ errMsg = "iLS sign in information is not valid.";
+ out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
return;
}
// end standard service header -----------------------------------
@@ -73,6 +79,7 @@
logger.debug("char 2: " + data.charAt(2));
*/
+ eventsLogger.debug("CCURE user/put: data: " + data);
XMLBlock doc = null;
XMLBlock records[] = null;
++errCode;
@@ -81,16 +88,21 @@
records = doc.getBlocks("SoftwareHouse.NextGen.Common.SecurityObjects.Personnel");
}
catch (Exception e) {
- out.print("<error code=\""+errCode+"\" message=\"Error parsing XML: "+e+"\"/>");
+ errMsg = "Error parsing XML: "+e;
+ out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
return;
}
++errCode;
- if (records == null || records.length < 1) {
- out.print("<error code=\""+errCode+"\" message=\"No CCURE Personnel record found in XML data.\"/>");
+ if (doc == null || !"CrossFire".equals(doc.getName())) {
+ errMsg = "No CrossFire block found in XML data.";
+ out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
return;
}
+ if (records == null) records = new XMLBlock[0];
StringWriter result = new StringWriter();
int loopStartErrCode = errCode;
int success = 0;
@@ -128,11 +140,9 @@
// one of these must be supplied; otherwise, show usage info
++errCode;
if (userProfileID != -1 || loginID != null || userData != null) {
- String errMsg = "";
UserProfile adminUser = ilsSession.getCurrentUserProfile();
- Logger eventsLogger = Logger.getLogger("EVENTS");
String statusMsg = "";
SimpleDateFormat df = new SimpleDateFormat("MM/dd/yyyy");
UserProfile current = new UserProfile();
@@ -282,6 +292,7 @@
errMsg = "The Employee ID already exists.";
result.write("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
result.write("</result>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
continue;
}
else {
@@ -345,6 +356,7 @@
errMsg = "Invalid Hire Date, please enter a reasonable date using the format MM/DD/YYYY";
result.write("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
result.write("</result>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
continue;
}
}
@@ -360,6 +372,7 @@
errMsg = "Invalid Termination Date, please enter a reasonable date using the format MM/DD/YYYY";
result.write("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
result.write("</result>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
continue;
}
}
@@ -373,6 +386,7 @@
errMsg = "You must supply a First Name (firstName)";
result.write("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
result.write("</result>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
continue;
}
++errCode;
@@ -380,6 +394,7 @@
errMsg = "You must supply a Last Name (lastName)";
result.write("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
result.write("</result>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
continue;
}
++errCode;
@@ -387,6 +402,7 @@
errMsg = "You must supply an Login ID (loginID)";
result.write("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
result.write("</result>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
continue;
}
@@ -396,6 +412,7 @@
errMsg = "You must choose a Role for this employee";
result.write("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
result.write("</result>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
continue;
}
*/
@@ -405,6 +422,7 @@
errMsg = "You must choose a Workgroup for this employee";
result.write("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
result.write("</result>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
continue;
}
*/
@@ -414,6 +432,7 @@
errMsg = "You must supply an Employee Title";
result.write("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
result.write("</result>");
+ eventsLogger.error("CCURE user/put:" + errMsg);
continue;
}
*/
@@ -457,6 +476,7 @@
if (success == total) out.print("</success>");
else out.print("</error>");
+ eventsLogger.info("CCURE user/put: success=" + success + "; total="+total);
return;
}
response.setContentType("text/html");
More information about the Ils-source
mailing list