[Ils-source] r1473 - trunk/src/com/resolutions/ils/data

scribe at crosswire.org scribe at crosswire.org
Mon Jun 27 17:09:33 MST 2016


Author: scribe
Date: 2016-06-27 17:09:33 -0700 (Mon, 27 Jun 2016)
New Revision: 1473

Modified:
   trunk/src/com/resolutions/ils/data/Course.java
Log:
Reformatted to use tabs consistently.


Modified: trunk/src/com/resolutions/ils/data/Course.java
===================================================================
--- trunk/src/com/resolutions/ils/data/Course.java	2016-06-27 23:25:42 UTC (rev 1472)
+++ trunk/src/com/resolutions/ils/data/Course.java	2016-06-28 00:09:33 UTC (rev 1473)
@@ -13,95 +13,95 @@
 
 
 public class Course extends DataObject {
-    static String LOOKUPALLCOURSES          = "SELECT * FROM COURSE WHERE (COURSISCURRICULUM IS NULL OR COURSISCURRICULUM<>'T') AND (COURSISQUICKVIEW IS NULL OR COURSISQUICKVIEW<>'T') AND COMPANYID={COMPANYID} ORDER BY COURSNAME";
-    static String LOOKUPALLCOURSESWACTCHECK = "SELECT * FROM COURSE WHERE (COURSISCURRICULUM IS NULL OR COURSISCURRICULUM<>'T') AND (COURSISQUICKVIEW IS NULL OR COURSISQUICKVIEW<>'T') AND COMPANYID={COMPANYID} AND COURSISACTIVE={COURSISACTIVE} ORDER BY COURSNAME";
-    static String LOOKUPALLQUICKVIEWS       = "SELECT * FROM COURSE WHERE (COURSISCURRICULUM IS NULL OR COURSISCURRICULUM<>'T') AND COURSISQUICKVIEW='T' AND COMPANYID={COMPANYID} ORDER BY COURSNAME";
-    static String LOOKUPALLCURRICULA        = "SELECT * FROM COURSE WHERE COURSISCURRICULUM='T' AND (COURSISQUICKVIEW IS NULL OR COURSISQUICKVIEW<>'T') AND COMPANYID={COMPANYID} ORDER BY COURSNAME";
+	static String LOOKUPALLCOURSES          = "SELECT * FROM COURSE WHERE (COURSISCURRICULUM IS NULL OR COURSISCURRICULUM<>'T') AND (COURSISQUICKVIEW IS NULL OR COURSISQUICKVIEW<>'T') AND COMPANYID={COMPANYID} ORDER BY COURSNAME";
+	static String LOOKUPALLCOURSESWACTCHECK = "SELECT * FROM COURSE WHERE (COURSISCURRICULUM IS NULL OR COURSISCURRICULUM<>'T') AND (COURSISQUICKVIEW IS NULL OR COURSISQUICKVIEW<>'T') AND COMPANYID={COMPANYID} AND COURSISACTIVE={COURSISACTIVE} ORDER BY COURSNAME";
+	static String LOOKUPALLQUICKVIEWS       = "SELECT * FROM COURSE WHERE (COURSISCURRICULUM IS NULL OR COURSISCURRICULUM<>'T') AND COURSISQUICKVIEW='T' AND COMPANYID={COMPANYID} ORDER BY COURSNAME";
+	static String LOOKUPALLCURRICULA        = "SELECT * FROM COURSE WHERE COURSISCURRICULUM='T' AND (COURSISQUICKVIEW IS NULL OR COURSISQUICKVIEW<>'T') AND COMPANYID={COMPANYID} ORDER BY COURSNAME";
 
-    static String LOOKUPUSERGROUPCOURSES = 
-    "SELECT DISTINCT T2.USERPRID, T1.*" +
-    " FROM COURSE T1" +
-         " JOIN COURSEGROUP T3 ON T3.COMPANYID=T1.COMPANYID AND T1.COURSID=T3.COURSID" +
-         " JOIN USERGROUP   T2 ON T2.COMPANYID=T3.COMPANYID AND T2.ILSGROUPID=T3.ILSGROUPID" +
-    " WHERE" +
-         "     (T1.COURSISCURRICULUM IS NULL OR T1.COURSISCURRICULUM<>'T')" +
-         " AND (T1.COURSISQUICKVIEW  IS NULL OR T1.COURSISQUICKVIEW<>'T')" +
-         " AND  T1.COMPANYID={COMPANYID}";
+	static String LOOKUPUSERGROUPCOURSES = 
+		"SELECT DISTINCT T2.USERPRID, T1.*" +
+		" FROM COURSE T1" +
+		" JOIN COURSEGROUP T3 ON T3.COMPANYID=T1.COMPANYID AND T1.COURSID=T3.COURSID" +
+		" JOIN USERGROUP   T2 ON T2.COMPANYID=T3.COMPANYID AND T2.ILSGROUPID=T3.ILSGROUPID" +
+		" WHERE" +
+		"     (T1.COURSISCURRICULUM IS NULL OR T1.COURSISCURRICULUM<>'T')" +
+		" AND (T1.COURSISQUICKVIEW  IS NULL OR T1.COURSISQUICKVIEW<>'T')" +
+		" AND  T1.COMPANYID={COMPANYID}";
 
-    static String LOOKUPUSERGROUPCOURSESACTIVE =
-    	          LOOKUPUSERGROUPCOURSES + " AND T1.COURSISACTIVE='T'";
+	static String LOOKUPUSERGROUPCOURSESACTIVE =
+		LOOKUPUSERGROUPCOURSES + " AND T1.COURSISACTIVE='T'";
 
-	
-    static String LOOKUPUSERCURRICULUMCOURSES =
-    "SELECT DISTINCT T2.USERPRID, T9.*" +
-    " FROM USERGROUP T2" +
-         " JOIN COURSEGROUP      T3 ON T3.COMPANYID = T2.COMPANYID AND T3.ILSGROUPID = T2.ILSGROUPID" +
-         " JOIN COURSE           T1 ON T1.COMPANYID = T3.COMPANYID AND T1.COURSID = T3.COURSID AND T1.COURSISCURRICULUM='T'" +
-         " JOIN CURRICULUMCOURSE T5 ON T5.COMPANYID = T1.COMPANYID AND T5.CURRICULUMID = T1.COURSID" +
-         " JOIN COURSE           T9 ON T9.COMPANYID = T5.COMPANYID AND T9.COURSID = T5.COURSID" +
-    " WHERE" +
-         "     (T9.COURSISCURRICULUM IS NULL OR T9.COURSISCURRICULUM<>'T')" +
-         " AND  T2.COMPANYID={COMPANYID}";
 
+	static String LOOKUPUSERCURRICULUMCOURSES =
+		"SELECT DISTINCT T2.USERPRID, T9.*" +
+		" FROM USERGROUP T2" +
+		" JOIN COURSEGROUP      T3 ON T3.COMPANYID = T2.COMPANYID AND T3.ILSGROUPID = T2.ILSGROUPID" +
+		" JOIN COURSE           T1 ON T1.COMPANYID = T3.COMPANYID AND T1.COURSID = T3.COURSID AND T1.COURSISCURRICULUM='T'" +
+		" JOIN CURRICULUMCOURSE T5 ON T5.COMPANYID = T1.COMPANYID AND T5.CURRICULUMID = T1.COURSID" +
+		" JOIN COURSE           T9 ON T9.COMPANYID = T5.COMPANYID AND T9.COURSID = T5.COURSID" +
+		" WHERE" +
+		"     (T9.COURSISCURRICULUM IS NULL OR T9.COURSISCURRICULUM<>'T')" +
+		" AND  T2.COMPANYID={COMPANYID}";
+
 	static String LOOKUPUSERCURRICULUMCOURSESACTIVE =
-		          LOOKUPUSERCURRICULUMCOURSES +" AND T1.COURSISACTIVE='T' AND T9.COURSISACTIVE='T'";
-   
-    
-    static String LOOKUPGROUPCOURSES   = "SELECT * FROM COURSE T1, COURSEGROUP T2 WHERE T1.COURSID=T2.COURSID AND T2.ILSGROUPID={ILSGROUPID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID}";
-    static String LOOKUPUSERQUICKVIEWS = "SELECT * FROM COURSE T1, USERGROUP T2, COURSEGROUP T3 WHERE T1.COURSID=T3.COURSID AND T3.ILSGROUPID=T2.ILSGROUPID AND T1.COURSISQUICKVIEW='T'  AND T1.COURSISACTIVE='T' AND T2.USERPRID={USERPRID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID} AND T3.COMPANYID={COMPANYID} ORDER BY T1.COURSPOSTDATE DESC";
+		LOOKUPUSERCURRICULUMCOURSES +" AND T1.COURSISACTIVE='T' AND T9.COURSISACTIVE='T'";
 
-    static String LOOKUPUSERCURRICULA  = "SELECT * FROM COURSE T1, USERGROUP T2, COURSEGROUP T3 WHERE T1.COURSID=T3.COURSID AND T3.ILSGROUPID=T2.ILSGROUPID AND T1.COURSISCURRICULUM='T' AND T1.COURSISACTIVE='T' AND T2.USERPRID={USERPRID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID} AND T3.COMPANYID={COMPANYID} ORDER BY SORTORDER";
 
-    static String LOOKUPCURRICULUMCOURSES = "SELECT * FROM COURSE T1, CURRICULUMCOURSE T2 WHERE T1.COURSID=T2.COURSID AND (T1.COURSISCURRICULUM IS NULL OR T1.COURSISCURRICULUM<>'T') AND T1.COURSISACTIVE='T' AND T2.CURRICULUMID={COURSID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID} ORDER BY SORTORDER";
-    static String LOOKUP = "SELECT * FROM COURSE WHERE COMPANYID={COMPANYID}";
-    static String DELETE = "DELETE FROM COURSE WHERE COURSID={COURSID} AND COMPANYID={COMPANYID}";
-    static String DELETECURRICULUMCOURSES = "DELETE FROM CURRICULUMCOURSE WHERE CURRICULUMID={COURSID} AND COMPANYID={COMPANYID}";
-    static String ADDCOURSETOCURRIC        = "INSERT INTO CURRICULUMCOURSE (COMPANYID, CURRICULUMID, COURSID, SORTORDER) VALUES ({COMPANYID}, {CURRICID}, {COURSID}, {SORTORDER})";
-    static String ADDCOURSETOCURRICNOORDER = "INSERT INTO CURRICULUMCOURSE (COMPANYID, CURRICULUMID, COURSID)            VALUES ({COMPANYID}, {CURRICID}, {COURSID})";
+	static String LOOKUPGROUPCOURSES   = "SELECT * FROM COURSE T1, COURSEGROUP T2 WHERE T1.COURSID=T2.COURSID AND T2.ILSGROUPID={ILSGROUPID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID}";
+	static String LOOKUPUSERQUICKVIEWS = "SELECT * FROM COURSE T1, USERGROUP T2, COURSEGROUP T3 WHERE T1.COURSID=T3.COURSID AND T3.ILSGROUPID=T2.ILSGROUPID AND T1.COURSISQUICKVIEW='T'  AND T1.COURSISACTIVE='T' AND T2.USERPRID={USERPRID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID} AND T3.COMPANYID={COMPANYID} ORDER BY T1.COURSPOSTDATE DESC";
 
+	static String LOOKUPUSERCURRICULA  = "SELECT * FROM COURSE T1, USERGROUP T2, COURSEGROUP T3 WHERE T1.COURSID=T3.COURSID AND T3.ILSGROUPID=T2.ILSGROUPID AND T1.COURSISCURRICULUM='T' AND T1.COURSISACTIVE='T' AND T2.USERPRID={USERPRID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID} AND T3.COMPANYID={COMPANYID} ORDER BY SORTORDER";
+
+	static String LOOKUPCURRICULUMCOURSES = "SELECT * FROM COURSE T1, CURRICULUMCOURSE T2 WHERE T1.COURSID=T2.COURSID AND (T1.COURSISCURRICULUM IS NULL OR T1.COURSISCURRICULUM<>'T') AND T1.COURSISACTIVE='T' AND T2.CURRICULUMID={COURSID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID} ORDER BY SORTORDER";
+	static String LOOKUP = "SELECT * FROM COURSE WHERE COMPANYID={COMPANYID}";
+	static String DELETE = "DELETE FROM COURSE WHERE COURSID={COURSID} AND COMPANYID={COMPANYID}";
+	static String DELETECURRICULUMCOURSES = "DELETE FROM CURRICULUMCOURSE WHERE CURRICULUMID={COURSID} AND COMPANYID={COMPANYID}";
+	static String ADDCOURSETOCURRIC        = "INSERT INTO CURRICULUMCOURSE (COMPANYID, CURRICULUMID, COURSID, SORTORDER) VALUES ({COMPANYID}, {CURRICID}, {COURSID}, {SORTORDER})";
+	static String ADDCOURSETOCURRICNOORDER = "INSERT INTO CURRICULUMCOURSE (COMPANYID, CURRICULUMID, COURSID)            VALUES ({COMPANYID}, {CURRICID}, {COURSID})";
+
 	static Logger eventsLogger = Logger.getLogger("EVENTS");
-    static Logger logger = Logger.getLogger(Course.class);
+	static Logger logger = Logger.getLogger(Course.class);
 
-    public Course() {
-    }
+	public Course() {
+	}
 
-    protected DataObject createDataObject() {
-        return new Course();
-    }
+	protected DataObject createDataObject() {
+		return new Course();
+	}
 
-    static public int deleteCourse(ILSSession session, int courseID) {
-        Course query = new Course();
-        query.setCourseID(courseID);
-        query.setCompanyID(session.getCompanyID());
-        return query.executeSQL(DELETE);
-    }
+	static public int deleteCourse(ILSSession session, int courseID) {
+		Course query = new Course();
+		query.setCourseID(courseID);
+		query.setCompanyID(session.getCompanyID());
+		return query.executeSQL(DELETE);
+	}
 
-    public int save(ILSSession session, Course orig) {
-        String[] keyCols = new String[] {"COMPANYID", "COURSID"};
-        eventsLogger.info("Course " + orig.getCourseNum() + " modified by user: " + session.getCurrentUserProfile().getUserProfileNum());
-        return save(orig, "COURSE", keyCols);
-    }
+	public int save(ILSSession session, Course orig) {
+		String[] keyCols = new String[] {"COMPANYID", "COURSID"};
+		eventsLogger.info("Course " + orig.getCourseNum() + " modified by user: " + session.getCurrentUserProfile().getUserProfileNum());
+		return save(orig, "COURSE", keyCols);
+	}
 
-    public Course saveNew(ILSSession session) {
-        setValue("COMPANYID", new Integer(session.getCompanyID()));
-        saveNew("COURSE");
-        eventsLogger.info("Course " + getCourseNum() + " created by user: "+session.getCurrentUserProfile().getUserProfileNum());
-        return (Course) lookupThis("COURSE");
-    }
+	public Course saveNew(ILSSession session) {
+		setValue("COMPANYID", new Integer(session.getCompanyID()));
+		saveNew("COURSE");
+		eventsLogger.info("Course " + getCourseNum() + " created by user: "+session.getCurrentUserProfile().getUserProfileNum());
+		return (Course) lookupThis("COURSE");
+	}
 
 
-    static public Course getCourse(ILSSession session, int courseID) {
-	return getCourse(session.getCompanyID(), courseID);
-    }
+	static public Course getCourse(ILSSession session, int courseID) {
+		return getCourse(session.getCompanyID(), courseID);
+	}
 
-    static public Course getCourse(int companyID, int courseID) {
-        Course query = new Course();
-        String sql = LOOKUP + " AND COURSID={COURSID}";
-        query.setCourseID(courseID);
-        query.setCompanyID(companyID);
-        Vector rows = query.getDataSet(sql);
-        return (rows.size() > 0) ? (Course) rows.get(0) : null;
-    }
+	static public Course getCourse(int companyID, int courseID) {
+		Course query = new Course();
+		String sql = LOOKUP + " AND COURSID={COURSID}";
+		query.setCourseID(courseID);
+		query.setCompanyID(companyID);
+		Vector rows = query.getDataSet(sql);
+		return (rows.size() > 0) ? (Course) rows.get(0) : null;
+	}
 
 
 	static public Vector getGroupCourses(ILSSession session, int groupID) {
@@ -109,131 +109,129 @@
 	}
 
 
-    static public Vector getGroupCourses(int companyID, int groupID) {
-        Course query = new Course();
-        query.setCompanyID(companyID);
-        query.setValue("ILSGROUPID", new Integer(groupID));
-        return query.getDataSet(LOOKUPGROUPCOURSES);
-    }
+	static public Vector getGroupCourses(int companyID, int groupID) {
+		Course query = new Course();
+		query.setCompanyID(companyID);
+		query.setValue("ILSGROUPID", new Integer(groupID));
+		return query.getDataSet(LOOKUPGROUPCOURSES);
+	}
 
 
-    static public Course getCourseByNum(ILSSession session, String courseNum) {
-        Course query = new Course();
-        String sql = LOOKUP + " AND COURSNUM={COURSNUM}";
-        query.setCourseNum(courseNum);
-        query.setCompanyID(session.getCompanyID());
-        Vector rows = query.getDataSet(sql);
-        return (rows.size() > 0) ? (Course) rows.get(0) : null;
-    }
+	static public Course getCourseByNum(ILSSession session, String courseNum) {
+		Course query = new Course();
+		String sql = LOOKUP + " AND COURSNUM={COURSNUM}";
+		query.setCourseNum(courseNum);
+		query.setCompanyID(session.getCompanyID());
+		Vector rows = query.getDataSet(sql);
+		return (rows.size() > 0) ? (Course) rows.get(0) : null;
+	}
 
-    static public Collection<Course> getUserCurricula(ILSSession session, int userID) {
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        query.setValue("USERPRID", new Integer(userID));
-	Map<Integer, Course> uniqueCurricula = new HashMap<Integer, Course>();
-        for (Object o : query.getDataSet(LOOKUPUSERCURRICULA)) {
-		Course c = (Course)o;
-		uniqueCurricula.put(c.getCourseID(), c);
+	static public Collection<Course> getUserCurricula(ILSSession session, int userID) {
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		query.setValue("USERPRID", new Integer(userID));
+		Map<Integer, Course> uniqueCurricula = new HashMap<Integer, Course>();
+		for (Object o : query.getDataSet(LOOKUPUSERCURRICULA)) {
+			Course c = (Course)o;
+			uniqueCurricula.put(c.getCourseID(), c);
+		}
+		return uniqueCurricula.values();
 	}
-        return uniqueCurricula.values();
-    }
 
-    static public Vector getAllCourses(ILSSession session) {
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        return query.getDataSet(LOOKUPALLCOURSES);
-    }
+	static public Vector getAllCourses(ILSSession session) {
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		return query.getDataSet(LOOKUPALLCOURSES);
+	}
 
-    static public Vector getAllCourses(ILSSession session, boolean active) {
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        query.setCourseActive(active);
-        return query.getDataSet(LOOKUPALLCOURSESWACTCHECK);
-    }
+	static public Vector getAllCourses(ILSSession session, boolean active) {
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		query.setCourseActive(active);
+		return query.getDataSet(LOOKUPALLCOURSESWACTCHECK);
+	}
 
-    static public Vector getAllCurricula(ILSSession session) {
-        Course query = new Course();
-        query.setValue("COMPANYID", new Integer(session.getCompanyID()));
-        return query.getDataSet(LOOKUPALLCURRICULA);
-    }
+	static public Vector getAllCurricula(ILSSession session) {
+		Course query = new Course();
+		query.setValue("COMPANYID", new Integer(session.getCompanyID()));
+		return query.getDataSet(LOOKUPALLCURRICULA);
+	}
 
-    static public Vector getAllQuickViews(ILSSession session) {
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        return query.getDataSet(LOOKUPALLQUICKVIEWS);
-    }
+	static public Vector getAllQuickViews(ILSSession session) {
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		return query.getDataSet(LOOKUPALLQUICKVIEWS);
+	}
 
-    static public Vector getActiveUserCourses(ILSSession session, int userID) {
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        query.setValue("USERPRID", new Integer(userID));
-        Vector retVal = query.getDataSet(
-        					"SELECT * FROM (" +
-        					LOOKUPUSERCURRICULUMCOURSESACTIVE +
-        					" UNION " +
-        					LOOKUPUSERGROUPCOURSESACTIVE +
-        					") T1 WHERE T1.USERPRID={USERPRID}" +
-        					" ORDER BY COURSNUM"
-        				);
-        return retVal;
-    }
+	static public Vector getActiveUserCourses(ILSSession session, int userID) {
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		query.setValue("USERPRID", new Integer(userID));
+		Vector retVal = query.getDataSet(
+			"SELECT * FROM (" +
+			LOOKUPUSERCURRICULUMCOURSESACTIVE +
+			" UNION " +
+			LOOKUPUSERGROUPCOURSESACTIVE +
+			") T1 WHERE T1.USERPRID={USERPRID}" +
+			" ORDER BY COURSNUM"
+		);
+		return retVal;
+	}
 
 
-    static public Vector getAllUserCourses(ILSSession session, int userID) {
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        query.setValue("USERPRID", new Integer(userID));
-        Vector retVal = query.getDataSet(
-        					"SELECT * FROM (" +
-        					LOOKUPUSERCURRICULUMCOURSES +
-        					" UNION " + 
-        					LOOKUPUSERGROUPCOURSES +
-        					") T1 WHERE T1.USERPRID={USERPRID}"
-        				);
-        return retVal;
-    }
+	static public Vector getAllUserCourses(ILSSession session, int userID) {
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		query.setValue("USERPRID", new Integer(userID));
+		Vector retVal = query.getDataSet(
+			"SELECT * FROM (" +
+			LOOKUPUSERCURRICULUMCOURSES +
+			" UNION " + 
+			LOOKUPUSERGROUPCOURSES +
+			") T1 WHERE T1.USERPRID={USERPRID}"
+		);
+		return retVal;
+	}
 
 
-    static public void appendUserCoursesFromAttempts(Vector courses, ILSSession session, int userID) {
-        String LOOKUPUSERCOURSEATTEMPTS = "SELECT * FROM COURSE T1, COURSEATTEMPT T2 WHERE T1.COURSID = T2.COURSID AND T2.USERPRID={USERPRID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID}";
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        query.setIntValue("USERPRID", userID);
-        Vector retVal = query.getDataSet(LOOKUPUSERCOURSEATTEMPTS);
+	static public void appendUserCoursesFromAttempts(Vector courses, ILSSession session, int userID) {
+		String LOOKUPUSERCOURSEATTEMPTS = "SELECT * FROM COURSE T1, COURSEATTEMPT T2 WHERE T1.COURSID = T2.COURSID AND T2.USERPRID={USERPRID} AND T1.COMPANYID={COMPANYID} AND T2.COMPANYID={COMPANYID}";
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		query.setIntValue("USERPRID", userID);
+		Vector retVal = query.getDataSet(LOOKUPUSERCOURSEATTEMPTS);
 
-        // remove duplicate courses assigned by different paths
-        for (int i = 0; i < retVal.size(); i++) {
-            Course cc = (Course)retVal.get(i);
-            if ((cc.getIntValue("CASTATUSID") == CourseAttempt.STATUS_FAILED)
-                     || (cc.getIntValue("CASTATUSID") == CourseAttempt.STATUS_PASSED)) {
-                int j;
-                for (j = 0; j < courses.size(); j++) {
-                    Course c2 = (Course)courses.get(j);
-                    if (c2.getCourseID() == cc.getCourseID())
-                        break;
-                }
-                if (j == courses.size()) {
-                    courses.add(cc);
-                }
-            }
-        }
-    }
+		// remove duplicate courses assigned by different paths
+		for (int i = 0; i < retVal.size(); i++) {
+			Course cc = (Course)retVal.get(i);
+			if ((cc.getIntValue("CASTATUSID") == CourseAttempt.STATUS_FAILED) || (cc.getIntValue("CASTATUSID") == CourseAttempt.STATUS_PASSED)) {
+				int j;
+				for (j = 0; j < courses.size(); j++) {
+					Course c2 = (Course)courses.get(j);
+					if (c2.getCourseID() == cc.getCourseID())
+						break;
+				}
+				if (j == courses.size()) {
+					courses.add(cc);
+				}
+			}
+		}
+	}
 
 
-    static public Vector getUserQuickViews(ILSSession session, int userID) {
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        query.setValue("USERPRID", new Integer(userID));
-        return query.getDataSet(LOOKUPUSERQUICKVIEWS);
-    }
+	static public Vector getUserQuickViews(ILSSession session, int userID) {
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		query.setValue("USERPRID", new Integer(userID));
+		return query.getDataSet(LOOKUPUSERQUICKVIEWS);
+	}
 
-    static public Vector<Course> getCurriculumCourses(ILSSession session,
-                                              int curriculumID) {
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        query.setCourseID(curriculumID);
-        return query.getDataSet(LOOKUPCURRICULUMCOURSES);
-    }
+	static public Vector<Course> getCurriculumCourses(ILSSession session, int curriculumID) {
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		query.setCourseID(curriculumID);
+		return query.getDataSet(LOOKUPCURRICULUMCOURSES);
+	}
 
 	private Vector<Course> curCourses = null;
 
@@ -254,314 +252,309 @@
 		return false;
 	}
 
-    static public int deleteCurriculumCourses(ILSSession session, int courseID) {
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        query.setCourseID(courseID);
-        return query.executeSQL(DELETECURRICULUMCOURSES);
-    }
+	static public int deleteCurriculumCourses(ILSSession session, int courseID) {
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		query.setCourseID(courseID);
+		return query.executeSQL(DELETECURRICULUMCOURSES);
+	}
 
-    static public int addCourseToCurriculum(ILSSession session, int curricID,
-                                            int courseID, Integer sortOrder) {
-        Course query = new Course();
-        query.setCompanyID(session.getCompanyID());
-        query.setValue("CURRICID", new Integer(curricID));
-        query.setValue("SORTORDER", sortOrder);
-        query.setCourseID(courseID);
-        return query.executeSQL((sortOrder != null) ? ADDCOURSETOCURRIC : ADDCOURSETOCURRICNOORDER);
-    }
+	static public int addCourseToCurriculum(ILSSession session, int curricID, int courseID, Integer sortOrder) {
+		Course query = new Course();
+		query.setCompanyID(session.getCompanyID());
+		query.setValue("CURRICID", new Integer(curricID));
+		query.setValue("SORTORDER", sortOrder);
+		query.setCourseID(courseID);
+		return query.executeSQL((sortOrder != null) ? ADDCOURSETOCURRIC : ADDCOURSETOCURRICNOORDER);
+	}
 
 
-    public Date getCoursePostDate() {
-        return getDateValue("COURSPOSTDATE");
-    }
+	public Date getCoursePostDate() {
+		return getDateValue("COURSPOSTDATE");
+	}
 
-    public float getCourseCost() {
-    	try {
+	public float getCourseCost() {
+		try {
 			return getFloatValue("COURSCOST");
-    	} catch (Exception e) {}
-    	return 0;
-    }
+		} catch (Exception e) {}
+		return 0;
+	}
 
-    public String getCourseDesc() {
-        return getStringValue("COURSDESC");
-    }
+	public String getCourseDesc() {
+		return getStringValue("COURSDESC");
+	}
 
-    public int getCourseID() {
-        return getIntValue("COURSID");
-    }
+	public int getCourseID() {
+		return getIntValue("COURSID");
+	}
 
-    public void setCourseID(int id) {
-        setIntValue("COURSID", id);
-    }
+	public void setCourseID(int id) {
+		setIntValue("COURSID", id);
+	}
 
-    public String getCourseURL() {
-        return getStringValue("COURSURL");
-    }
+	public String getCourseURL() {
+		return getStringValue("COURSURL");
+	}
 
-    public String getCourseChecklistURL() {
-        return getStringValue("COURSCKLISTURL");
-    }
+	public String getCourseChecklistURL() {
+		return getStringValue("COURSCKLISTURL");
+	}
 
-    public String getCourseCertificateGenerator() {
-        return getStringValue("COURSCERTGEN");
-    }
+	public String getCourseCertificateGenerator() {
+		return getStringValue("COURSCERTGEN");
+	}
 
-    public String getCourseName() {
-        return getStringValue("COURSNAME");
-    }
+	public String getCourseName() {
+		return getStringValue("COURSNAME");
+	}
 
-    public String getCourseNum() {
-        return getStringValue("COURSNUM");
-    }
+	public String getCourseNum() {
+		return getStringValue("COURSNUM");
+	}
 
-    public int getCoursePass() {
-        return getIntValue("COURSPASS");
-    }
+	public int getCoursePass() {
+		return getIntValue("COURSPASS");
+	}
 
-    public int getCourseReassignBeforeDays() {
-        return getIntValue("COURSREASBEFDAYS");
-    }
+	public int getCourseReassignBeforeDays() {
+		return getIntValue("COURSREASBEFDAYS");
+	}
 
-    public int getCoursePassExpireDays() {
-        return getIntValue("COURSPASSEXPDAYS");
-    }
+	public int getCoursePassExpireDays() {
+		return getIntValue("COURSPASSEXPDAYS");
+	}
 
-    public int getCourseSeatMinutes() {
-        return getIntValue("COURSSEATMINS");
-    }
+	public int getCourseSeatMinutes() {
+		return getIntValue("COURSSEATMINS");
+	}
 
-    // todo
-    public String getCourseType() {
-        return getStringValue("COURSTYPE");
-    }
+	// todo
+	public String getCourseType() {
+		return getStringValue("COURSTYPE");
+	}
 
-    public int getCourseTypeID() {
-        return getIntValue("COURSTYPEID");
-    }
+	public int getCourseTypeID() {
+		return getIntValue("COURSTYPEID");
+	}
 
-    public String getCourseIPRestricted() {
-        return getStringValue("COURSISIPRESTRICTED");
-    }
+	public String getCourseIPRestricted() {
+		return getStringValue("COURSISIPRESTRICTED");
+	}
 
-    public boolean isCourseIPRestricted() {
-        return ("T".equals(getValue("COURSISIPRESTRICTED")));
-    }
+	public boolean isCourseIPRestricted() {
+		return ("T".equals(getValue("COURSISIPRESTRICTED")));
+	}
 
-    public boolean isCourseCurriculum() {
-        return ("T".equals(getValue("COURSISCURRICULUM")));
-    }
+	public boolean isCourseCurriculum() {
+		return ("T".equals(getValue("COURSISCURRICULUM")));
+	}
 
-    public boolean isCourseCurriculumCertificate() {
-        return ("T".equals(getValue("COURSISCURRICCERT")));
-    }
+	public boolean isCourseCurriculumCertificate() {
+		return ("T".equals(getValue("COURSISCURRICCERT")));
+	}
 
-    public boolean isCourseAllowCurriculumPartRetake() {
-        return ("T".equals(getValue("COURSISALLOWCURRPARTRETAKE")));
-    }
+	public boolean isCourseAllowCurriculumPartRetake() {
+		return ("T".equals(getValue("COURSISALLOWCURRPARTRETAKE")));
+	}
 
-    public boolean isCourseQuickView() {
-        return ("T".equals(getValue("COURSISQUICKVIEW")));
-    }
+	public boolean isCourseQuickView() {
+		return ("T".equals(getValue("COURSISQUICKVIEW")));
+	}
 
-    public boolean isCourseActive() {
-        return ("T".equals(getValue("COURSISACTIVE")));
-    }
+	public boolean isCourseActive() {
+		return ("T".equals(getValue("COURSISACTIVE")));
+	}
 
-    public boolean isCourseRequiresManagerApproval() {
-        return ("T".equals(getValue("COURSREQMGRAPPRVL")));
-    }
+	public boolean isCourseRequiresManagerApproval() {
+		return ("T".equals(getValue("COURSREQMGRAPPRVL")));
+	}
 
 
-    public void setCoursePostDate(Date postDate) {
-        setDateValue("COURSPOSTDATE", postDate);
-    }
+	public void setCoursePostDate(Date postDate) {
+		setDateValue("COURSPOSTDATE", postDate);
+	}
 
-    public void setCourseCost(float cost) {
-        setFloatValue("COURSCOST", cost);
-    }
+	public void setCourseCost(float cost) {
+		setFloatValue("COURSCOST", cost);
+	}
 
-    public void setCourseDesc(String desc) {
-        setValue("COURSDESC", desc);
-    }
+	public void setCourseDesc(String desc) {
+		setValue("COURSDESC", desc);
+	}
 
-    public void setCourseURL(String url) {
-        setValue("COURSURL", url);
-    }
+	public void setCourseURL(String url) {
+		setValue("COURSURL", url);
+	}
 
-    public void setCourseChecklistURL(String url) {
-        setValue("COURSCKLISTURL", url);
-    }
+	public void setCourseChecklistURL(String url) {
+		setValue("COURSCKLISTURL", url);
+	}
 
-    public void setCourseCertificateGenerator(String val) {
-        setValue("COURSCERTGEN", val);
-    }
+	public void setCourseCertificateGenerator(String val) {
+		setValue("COURSCERTGEN", val);
+	}
 
-    public void setCourseName(String name) {
-        setValue("COURSNAME", name);
-    }
+	public void setCourseName(String name) {
+		setValue("COURSNAME", name);
+	}
 
-    public void setCourseNum(String num) {
-        setValue("COURSNUM", num);
-    }
+	public void setCourseNum(String num) {
+		setValue("COURSNUM", num);
+	}
 
-    public void setCoursePass(int passScore) {
-        setIntValue("COURSPASS", passScore);
-    }
+	public void setCoursePass(int passScore) {
+		setIntValue("COURSPASS", passScore);
+	}
 
-    public void setCourseReassignBeforeDays(int days) {
-        setIntValue("COURSREASBEFDAYS", days);
-    }
+	public void setCourseReassignBeforeDays(int days) {
+		setIntValue("COURSREASBEFDAYS", days);
+	}
 
-    public void setCoursePassExpireDays(int days) {
-        setIntValue("COURSPASSEXPDAYS", days);
-    }
+	public void setCoursePassExpireDays(int days) {
+		setIntValue("COURSPASSEXPDAYS", days);
+	}
 
-    public void setCourseSeatMinutes(int mins) {
-        setIntValue("COURSSEATMINS", mins);
-    }
+	public void setCourseSeatMinutes(int mins) {
+		setIntValue("COURSSEATMINS", mins);
+	}
 
-    public void setCourseTypeID(int courseTypeID) {
-        setIntValue("COURSTYPEID", courseTypeID);
-    }
+	public void setCourseTypeID(int courseTypeID) {
+		setIntValue("COURSTYPEID", courseTypeID);
+	}
 
-    public void setCourseCurriculum(boolean isCurriculum) {
-        setValue("COURSISCURRICULUM", (isCurriculum) ? "T" : "F");
-    }
+	public void setCourseCurriculum(boolean isCurriculum) {
+		setValue("COURSISCURRICULUM", (isCurriculum) ? "T" : "F");
+	}
 
-    public void setCourseCurriculumCertificate(boolean val) {
-        setValue("COURSISCURRICCERT", (val) ? "T" : "F");
-    }
+	public void setCourseCurriculumCertificate(boolean val) {
+		setValue("COURSISCURRICCERT", (val) ? "T" : "F");
+	}
 
-    public void setCourseAllowCurriculumPartRetake(boolean val) {
-        setValue("COURSISALLOWCURRPARTRETAKE", (val) ? "T" : "F");
-    }
+	public void setCourseAllowCurriculumPartRetake(boolean val) {
+		setValue("COURSISALLOWCURRPARTRETAKE", (val) ? "T" : "F");
+	}
 
-    public void setCourseQuickView(boolean isQuickView) {
-        setValue("COURSISQUICKVIEW", (isQuickView) ? "T" : "F");
-    }
+	public void setCourseQuickView(boolean isQuickView) {
+		setValue("COURSISQUICKVIEW", (isQuickView) ? "T" : "F");
+	}
 
-    public void setCourseActive(boolean isActive) {
-        setValue("COURSISACTIVE", (isActive) ? "T" : "F");
-    }
+	public void setCourseActive(boolean isActive) {
+		setValue("COURSISACTIVE", (isActive) ? "T" : "F");
+	}
 
-    public void setCourseRequiresManagerApproval(boolean val) {
-        setValue("COURSREQMGRAPPRVL", (val) ? "T" : "F");
-    }
+	public void setCourseRequiresManagerApproval(boolean val) {
+		setValue("COURSREQMGRAPPRVL", (val) ? "T" : "F");
+	}
 
-    public void setCourseIPRestricted(String val) {
-        setValue("COURSISIPRESTRICTED", val);
-    }
+	public void setCourseIPRestricted(String val) {
+		setValue("COURSISIPRESTRICTED", val);
+	}
 
-    public void setCourseIPRestricted(boolean val) {
-        setValue("COURSISIPRESTRICTED", (val) ? "T" : "F");
-    }
+	public void setCourseIPRestricted(boolean val) {
+		setValue("COURSISIPRESTRICTED", (val) ? "T" : "F");
+	}
 
-    public String getCourseSeatTimeText() {
-        return getNiceTimeText(getCourseSeatMinutes());
-    }
+	public String getCourseSeatTimeText() {
+		return getNiceTimeText(getCourseSeatMinutes());
+	}
 
-    public static String getNiceTimeText(int minutes) {
-        int seatMinutes = minutes;
-        int seatDays = seatMinutes / (60 * 24);
-        seatMinutes = seatMinutes % (60 * 24);
-        int seatHours = seatMinutes / 60;
-        seatMinutes = seatMinutes % 60;
-        String timeFrame = (seatDays > 0) ?
-                           (Integer.toString(seatDays) + " Day" +
-                            ((seatDays != 1) ? "s " : " ")) : "";
-        timeFrame += (seatHours > 0) ?
-                (Integer.toString(seatHours) + " Hour" +
-                 ((seatHours != 1) ? "s " : " ")) : "";
-        timeFrame += (seatMinutes > 0) ?
-                (Integer.toString(seatMinutes) + " Minute" +
-                 ((seatMinutes != 1) ? "s" : "")) : "";
-        return timeFrame;
-    }
+	public static String getNiceTimeText(int minutes) {
+		int seatMinutes = minutes;
+		int seatDays = seatMinutes / (60 * 24);
+		seatMinutes = seatMinutes % (60 * 24);
+		int seatHours = seatMinutes / 60;
+		seatMinutes = seatMinutes % 60;
+		String timeFrame = (seatDays > 0) ?  (Integer.toString(seatDays) + " Day" + ((seatDays != 1) ? "s " : " ")) : "";
+		timeFrame += (seatHours > 0) ?  (Integer.toString(seatHours) + " Hour" + ((seatHours != 1) ? "s " : " ")) : "";
+		timeFrame += (seatMinutes > 0) ?  (Integer.toString(seatMinutes) + " Minute" + ((seatMinutes != 1) ? "s" : "")) : "";
+		return timeFrame;
+	}
 
-    public void defaultAll() {
-        setCourseNum("");
-        setCourseName("");
-        setCourseDesc("");
-        setCourseActive(true);
-        setCourseRequiresManagerApproval(false);
-        setCourseQuickView(false);
-        setCourseTypeID(2);
-        setCourseURL("");
-    }
+	public void defaultAll() {
+		setCourseNum("");
+		setCourseName("");
+		setCourseDesc("");
+		setCourseActive(true);
+		setCourseRequiresManagerApproval(false);
+		setCourseQuickView(false);
+		setCourseTypeID(2);
+		setCourseURL("");
+	}
 
 
-    public String getCourseFrameFeatures(javax.servlet.ServletContext context) {
+	public String getCourseFrameFeatures(javax.servlet.ServletContext context) {
 
-        /*
+	/*
 
-        Javascript window.open features, ','-separated.  Many of these are =yes|no
+	Javascript window.open features, ','-separated.  Many of these are =yes|no
 
-        status      The status bar at the bottom of the window.
-        toolbar     The standard browser toolbar, with buttons such as Back and Forward.
-        location    The Location entry field where you enter the URL.
-        menubar     The menu bar of the window
-        directories The standard browser directory buttons, such as What's New and What's Cool
-        resizable   Allow/Disallow the user to resize the window.
-        scrollbars  Enable the scrollbars if the document is bigger than the window
-        height      Specifies the height of the window in pixels. (example: height='350')
-        width       Specifies the width of the window in pixels.
+	status      The status bar at the bottom of the window.
+	toolbar     The standard browser toolbar, with buttons such as Back and Forward.
+	location    The Location entry field where you enter the URL.
+	menubar     The menu bar of the window
+	directories The standard browser directory buttons, such as What's New and What's Cool
+	resizable   Allow/Disallow the user to resize the window.
+	scrollbars  Enable the scrollbars if the document is bigger than the window
+	height      Specifies the height of the window in pixels. (example: height='350')
+	width       Specifies the width of the window in pixels.
 
-        */
+	*/
 
-        // Default
-        String retVal = "width=800,height=600";
-        String url = getCourseURL();
+		// Default
+		String retVal = "width=800,height=600";
+		String url = getCourseURL();
 
 		if ((url != null) && (url.endsWith("frameset.htm"))) {
-            url = url.substring(0, url.length()-"frameset.htm".length());
-            url += "course.xml";
+			url = url.substring(0, url.length()-"frameset.htm".length());
+			url += "course.xml";
 			java.net.URL courseXML = null;
 			org.xml.sax.InputSource inputSource = null;
 			String expression = "/course";
-            try {
+			try {
 				courseXML = new java.net.URL(url);
-                inputSource = new org.xml.sax.InputSource(courseXML.openStream());
-            } catch (Exception ex) {
-//                logger.error(ex, ex);
-            }
-            if (inputSource == null) {
-		try {
-			File f = new File(context.getRealPath(url));
-			inputSource = new org.xml.sax.InputSource(new java.io.FileInputStream(f));
-		} catch (Exception ex) {
-		//					logger.error(ex, ex);
+				inputSource = new org.xml.sax.InputSource(courseXML.openStream());
+			}
+			catch (Exception ex) {
+//				logger.error(ex, ex);
+			}
+			if (inputSource == null) {
+				try {
+					File f = new File(context.getRealPath(url));
+					inputSource = new org.xml.sax.InputSource(new java.io.FileInputStream(f));
+				}
+				catch (Exception ex) {
+//					logger.error(ex, ex);
+				}
+			}
+			if (inputSource != null) {
+				try {
+					javax.xml.xpath.XPath xpath = javax.xml.xpath.XPathFactory.newInstance().newXPath();
+					com.sun.org.apache.xml.internal.dtm.ref.DTMNodeList nodes = (com.sun.org.apache.xml.internal.dtm.ref.DTMNodeList) xpath.evaluate(expression, inputSource, javax.xml.xpath.XPathConstants.NODESET);
+					if (nodes.getLength() > 0) {
+						org.w3c.dom.Node n = nodes.item(0);
+						org.w3c.dom.Node name = n.getAttributes().getNamedItem("frameFeatures");
+						if (name != null) {
+							retVal = (String) name.getNodeValue();
+						}
+					}
+				} catch (Exception ex) {
+					logger.error(ex, ex);
+				}
+			}
+			else {
+				logger.error("Bad course URL: " + url);
+			}
 		}
-            }
-            if (inputSource != null) {
-                try {
-			javax.xml.xpath.XPath xpath = javax.xml.xpath.XPathFactory.newInstance().newXPath();
-			com.sun.org.apache.xml.internal.dtm.ref.DTMNodeList nodes = (com.sun.org.apache.xml.internal.dtm.ref.DTMNodeList) xpath.evaluate(expression, inputSource, javax.xml.xpath.XPathConstants.NODESET);
-                    if (nodes.getLength() > 0) {
-                        org.w3c.dom.Node n = nodes.item(0);
-                        org.w3c.dom.Node name = n.getAttributes().getNamedItem("frameFeatures");
-                        if (name != null) {
-	                        retVal = (String) name.getNodeValue();
-                        }
-                    }
-                } catch (Exception ex) {
-                    logger.error(ex, ex);
-                }
-            }
-		else {
-			logger.error("Bad course URL: " + url);
-		}
-        }
-        return retVal;
-    }
+		return retVal;
+	}
 
 
-    public boolean equals(Object o) {
-        if (o instanceof Course) {
-                return (getCourseID() == ((Course)o).getCourseID());
-        }
-        return super.equals(o);
-    }
+	public boolean equals(Object o) {
+		if (o instanceof Course) {
+			return (getCourseID() == ((Course)o).getCourseID());
+		}
+		return super.equals(o);
+	}
 
 	public String toXML() {
 		return toXML(DETAIL_COMPLETE);




More information about the Ils-source mailing list