[Ils-source] r1487 - in branches/1.6: . webapp/WEB-INF/classes webapp/api/courseattempt webapp/api/courseattempt/assignretake webapp/api/courseattempt/get
scribe at crosswire.org
scribe at crosswire.org
Fri Jul 29 16:52:48 MST 2016
Author: scribe
Date: 2016-07-29 16:52:48 -0700 (Fri, 29 Jul 2016)
New Revision: 1487
Added:
branches/1.6/webapp/api/courseattempt/assignretake/
branches/1.6/webapp/api/courseattempt/assignretake/index.jsp
Removed:
branches/1.6/webapp/api/courseattempt/assignRetake/
branches/1.6/webapp/api/courseattempt/assignretake/index.jsp
Modified:
branches/1.6/
branches/1.6/webapp/WEB-INF/classes/versions.properties
branches/1.6/webapp/api/courseattempt/get/index.jsp
Log:
merging in fixes for courseattempt web services
Release 1.80.8
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,1427,1429,1431,1434,1436,1441,1446-1448,1457,1464,1466-1467,1470-1484
+ /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,1429,1431,1434,1436,1441,1446-1448,1457,1464,1466-1467,1470-1484,1486
Modified: branches/1.6/webapp/WEB-INF/classes/versions.properties
===================================================================
--- branches/1.6/webapp/WEB-INF/classes/versions.properties 2016-07-29 23:48:26 UTC (rev 1486)
+++ branches/1.6/webapp/WEB-INF/classes/versions.properties 2016-07-29 23:52:48 UTC (rev 1487)
@@ -1 +1 @@
-LMS=V1.80.7
+LMS=V1.80.8
Deleted: branches/1.6/webapp/api/courseattempt/assignretake/index.jsp
===================================================================
--- trunk/webapp/api/courseattempt/assignretake/index.jsp 2016-07-29 23:48:26 UTC (rev 1486)
+++ branches/1.6/webapp/api/courseattempt/assignretake/index.jsp 2016-07-29 23:52:48 UTC (rev 1487)
@@ -1,89 +0,0 @@
-<%@ page
- language="java"
- contentType="text/html;charset=utf-8"
-%>
-<%@ page trimDirectiveWhitespaces="true" %>
-<%@ page import="org.crosswire.utils.HTTPUtils" %>
-<%@ page import="com.resolutions.ils.Utils" %>
-<%@ page import="com.resolutions.ils.ILSSession" %>
-<%@ page import="com.resolutions.ils.data.UserProfile" %>
-<%@ page import="com.resolutions.ils.data.Company" %>
-<%@ page import="com.resolutions.ils.data.CourseAttempt" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="java.util.TimeZone" %>
-<%@ page import="java.io.File" %>
-<%@ page import="java.net.URL" %>
-<%@ page import="java.util.Properties" %>
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="org.apache.log4j.Logger" %>
-
-<%
-
- // standard service header ---------------------------------------
-
- String serviceName = "courseattempt/assignretake";
-
- Logger logger = Logger.getLogger(this.getClass());
- Logger eventsLogger = Logger.getLogger("EVENTS");
-
- response.setContentType("text/xml");
-
- String errMsg = "";
- int errCode = 0;
- Company company = Company.getCompany(request);
-
- boolean apiEnabled = "on".equals(Utils.getSysConfig(session.getServletContext(), company.getCompanyID()).getProperty("APIEnable", "off"));
- ++errCode;
- if (!apiEnabled) {
- errMsg = "API not enabled in system management settings.";
- out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
- eventsLogger.error(serviceName +": " + errMsg);
- return;
- }
-
- String userID = request.getParameter("ILSUSER");
- String userPW = request.getParameter("ILSPASSWD");
- ILSSession ilsSession = (userID != null && userPW != null)
- ? ILSSession.login(company.getCompanyName(), userID, userPW)
- : (ILSSession)session.getAttribute("ilsSession");
- ++errCode;
- if (ilsSession == null) {
- errMsg = "iLS sign in information is not valid.";
- out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
- eventsLogger.error(serviceName +": " + errMsg);
- return;
- }
- // end standard service header -----------------------------------
-
- String statusMsg = "";
- int courseAttemptID = -1; try { courseAttemptID = Integer.parseInt(request.getParameter("courseAttemptID")); } catch(Exception e) {}
- String reason = request.getParameter("reason");
- if (reason != null) reason = new String(reason.getBytes("iso8859-1"), "UTF-8");
- if (reason == null) reason = "";
- if (courseAttemptID > -1) {
- CourseAttempt caOrig = CourseAttempt.getCourseAttempt(ilsSession, courseAttemptID);
- if (caOrig != null) {
- caOrig.assignRetake(reason, ilsSession, session);
- out.print("<success />");
- return;
- } else {
- ++errCode;
- out.print("<error code=\""+errCode+"\" message=\"Course attempt not found.\"/>");
- eventsLogger.error(serviceName +": " + errMsg);
- return;
- }
- }
- response.setContentType("text/html");
-%>
-<html>
-<body>
-<h1>courseattempt/assignRetake</h1>
-<p>Assign a retake for a course attempt</p>
-<h3>Parameters</h3>
-<table border="1">
-<tr><td><b>courseAttemptID</b></td><td>Course Attempt ID</td></tr>
-<tr><td><b>reason</b></td><td>Reason for retake</td></tr>
-<table>
-</body>
-</html>
Copied: branches/1.6/webapp/api/courseattempt/assignretake/index.jsp (from rev 1486, trunk/webapp/api/courseattempt/assignretake/index.jsp)
===================================================================
--- branches/1.6/webapp/api/courseattempt/assignretake/index.jsp (rev 0)
+++ branches/1.6/webapp/api/courseattempt/assignretake/index.jsp 2016-07-29 23:52:48 UTC (rev 1487)
@@ -0,0 +1,89 @@
+<%@ page
+ language="java"
+ contentType="text/html;charset=utf-8"
+%>
+<%@ page trimDirectiveWhitespaces="true" %>
+<%@ page import="org.crosswire.utils.HTTPUtils" %>
+<%@ page import="com.resolutions.ils.Utils" %>
+<%@ page import="com.resolutions.ils.ILSSession" %>
+<%@ page import="com.resolutions.ils.data.UserProfile" %>
+<%@ page import="com.resolutions.ils.data.Company" %>
+<%@ page import="com.resolutions.ils.data.CourseAttempt" %>
+<%@ page import="java.util.Vector" %>
+<%@ page import="java.util.Date" %>
+<%@ page import="java.util.TimeZone" %>
+<%@ page import="java.io.File" %>
+<%@ page import="java.net.URL" %>
+<%@ page import="java.util.Properties" %>
+<%@ page import="java.text.SimpleDateFormat" %>
+<%@ page import="org.apache.log4j.Logger" %>
+
+<%
+
+ // standard service header ---------------------------------------
+
+ String serviceName = "courseattempt/assignretake";
+
+ Logger logger = Logger.getLogger(this.getClass());
+ Logger eventsLogger = Logger.getLogger("EVENTS");
+
+ response.setContentType("text/xml");
+
+ String errMsg = "";
+ int errCode = 0;
+ Company company = Company.getCompany(request);
+
+ boolean apiEnabled = "on".equals(Utils.getSysConfig(session.getServletContext(), company.getCompanyID()).getProperty("APIEnable", "off"));
+ ++errCode;
+ if (!apiEnabled) {
+ errMsg = "API not enabled in system management settings.";
+ out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
+ eventsLogger.error(serviceName +": " + errMsg);
+ return;
+ }
+
+ String userID = request.getParameter("ILSUSER");
+ String userPW = request.getParameter("ILSPASSWD");
+ ILSSession ilsSession = (userID != null && userPW != null)
+ ? ILSSession.login(company.getCompanyName(), userID, userPW)
+ : (ILSSession)session.getAttribute("ilsSession");
+ ++errCode;
+ if (ilsSession == null) {
+ errMsg = "iLS sign in information is not valid.";
+ out.print("<error code=\""+errCode+"\" message=\""+errMsg+"\"/>");
+ eventsLogger.error(serviceName +": " + errMsg);
+ return;
+ }
+ // end standard service header -----------------------------------
+
+ String statusMsg = "";
+ int courseAttemptID = -1; try { courseAttemptID = Integer.parseInt(request.getParameter("courseAttemptID")); } catch(Exception e) {}
+ String reason = request.getParameter("reason");
+ if (reason != null) reason = new String(reason.getBytes("iso8859-1"), "UTF-8");
+ if (reason == null) reason = "";
+ if (courseAttemptID > -1) {
+ CourseAttempt caOrig = CourseAttempt.getCourseAttempt(ilsSession, courseAttemptID);
+ if (caOrig != null) {
+ caOrig.assignRetake(reason, ilsSession, session);
+ out.print("<success />");
+ return;
+ } else {
+ ++errCode;
+ out.print("<error code=\""+errCode+"\" message=\"Course attempt not found.\"/>");
+ eventsLogger.error(serviceName +": " + errMsg);
+ return;
+ }
+ }
+ response.setContentType("text/html");
+%>
+<html>
+<body>
+<h1>courseattempt/assignRetake</h1>
+<p>Assign a retake for a course attempt</p>
+<h3>Parameters</h3>
+<table border="1">
+<tr><td><b>courseAttemptID</b></td><td>Course Attempt ID</td></tr>
+<tr><td><b>reason</b></td><td>Reason for retake</td></tr>
+<table>
+</body>
+</html>
Modified: branches/1.6/webapp/api/courseattempt/get/index.jsp
===================================================================
--- branches/1.6/webapp/api/courseattempt/get/index.jsp 2016-07-29 23:48:26 UTC (rev 1486)
+++ branches/1.6/webapp/api/courseattempt/get/index.jsp 2016-07-29 23:52:48 UTC (rev 1487)
@@ -55,7 +55,7 @@
// end standard service header -----------------------------------
- SimpleDateFormat df = new SimpleDateFormat("yyyyMMddhhmm");
+ SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmm");
df.setTimeZone(TimeZone.getTimeZone("GMT"));
SimpleDateFormat df_out = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
df_out.setTimeZone(TimeZone.getTimeZone("GMT"));
@@ -68,7 +68,7 @@
String val = request.getParameter("startDateTime");
Date startDateTime = null;
try { if (val != null) startDateTime = df.parse(val); } catch (Exception e) {
- out.print("<error code=\""+errCode+"\" message=\"startDateTime must be formatted as yyyyMMddhhmm\"/>");
+ out.print("<error code=\""+errCode+"\" message=\"startDateTime must be formatted as yyyyMMddHHmm\"/>");
return;
}
@@ -76,7 +76,7 @@
val = request.getParameter("endDateTime");
Date endDateTime = null;
try { if (val != null) endDateTime = df.parse(val); } catch (Exception e) {
- out.print("<error code=\""+errCode+"\" message=\"endDateTime must be formatted as yyyyMMddhhmm\"/>");
+ out.print("<error code=\""+errCode+"\" message=\"endDateTime must be formatted as yyyyMMddHHmm\"/>");
return;
}
@@ -121,8 +121,8 @@
<table border="1">
<tbody>
<tr><th>courseAttemptID</th><td>retrieve a specific course attempt by ID</td></tr>
-<tr><th>startDateTime</th><td>retrieve a set of course attempts by filters, the start of the date and time range for which to retrieve Course Attempt records by completion date, inclusive (yyyyMMddhhmm), e.g., 201201240000</td></tr>
-<tr><th>endDateTime</th><td>the end of the date and time range for which to retrieve Course Attempt records by completion date, exclusive (yyyyMMddhhmm), e.g., 201201250000</td></tr>
+<tr><th>startDateTime</th><td>retrieve a set of course attempts by filters, the start of the date and time range for which to retrieve Course Attempt records by completion date, inclusive (yyyyMMddHHmm), e.g., 201201240000</td></tr>
+<tr><th>endDateTime</th><td>the end of the date and time range for which to retrieve Course Attempt records by completion date, exclusive (yyyyMMddHHmm), e.g., 201201250000</td></tr>
<tr><td><b>userProfileID</b></td><td>restrict results to a single user</td></tr>
<tr><td><b>courseID</b></td><td>restrict results to a single course</td></tr>
<tr><th>detail</th><td>(complete), brief, headeronly</td></tr>
More information about the Ils-source
mailing list