[Ils-source] r1394 - in branches/1.6: . webapp/api/course/get

[scribe at crosswire.org]

Author: scribe
Date: 2016-02-16 16:57:18 -0700 (Tue, 16 Feb 2016)
New Revision: 1394

Modified:
   branches/1.6/
   branches/1.6/webapp/api/course/get/index.jsp
Log:
merged in logic to output error code if course not found



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-1355,1360-1365,1380-1383,1391
   + /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1355,1360-1365,1380-1383,1391,1393

Modified: branches/1.6/webapp/api/course/get/index.jsp
===================================================================
--- branches/1.6/webapp/api/course/get/index.jsp	2016-02-16 23:55:46 UTC (rev 1393)
+++ branches/1.6/webapp/api/course/get/index.jsp	2016-02-16 23:57:18 UTC (rev 1394)
@@ -60,17 +60,26 @@
 	SimpleDateFormat df_out = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
 	df_out.setTimeZone(TimeZone.getTimeZone("GMT"));
 
+	++errCode;
 	if (courseID > -2 || courseNumber != null) {
 		Vector<Course> courses = null;
 		if (courseID == -1) courses = Course.getAllCourses(ilsSession);
 		else {
 			courses = new Vector<Course>();
-			if (courseID > -1) try { courses.add((Course)Course.getCourse(ilsSession, courseID)); } catch (Exception e) {}
-			else if (courseNumber != null) try { courses.add((Course)Course.getCourseByNum(ilsSession, courseNumber)); } catch (Exception e) {}
+			Course c = null;
+			if (courseID > -1) c = Course.getCourse(ilsSession, courseID);
+			else if (courseNumber != null) c = Course.getCourseByNum(ilsSession, courseNumber);
+			if (c == null) {
+				out.print("<error code=\""+errCode+"\" message=\"Course not found.\"/>");
+				return;
+			}
+			courses.add(c);
 		}
 		out.print("<courses count=\""+courses.size()+"\">\n");
-		for (Object o : courses) {
-			out.print(((Course)o).toXML(detailLevel));
+		if (courses.size() > 0) {
+			for (Course c : courses) {
+				out.print(c.toXML(detailLevel));
+			}
 		}
 		out.print("</courses>\n");
 		return;