Generalization tweaks. Still need to go in an excise references to VIVOTagLib data sources.

Author: eichmann

src/main/java/edu/uiowa/slis/graphtaglib/SiteIDIterator.java

@@ -36,15 +36,19 @@ synchronized void init() throws NamingException, SQLException {
 	if (siteHash != null)
 	    return;
 	siteHash = new Hashtable<Integer, String>();
-	DataSource theDataSource = (DataSource) new InitialContext().lookup("java:/comp/env/jdbc/VIVOTagLib");
-	Connection conn = theDataSource.getConnection();
-	PreparedStatement stmt = conn.prepareStatement("select id,site from vivo_aggregated.site order by id");
-	ResultSet rs = stmt.executeQuery();
-	while (rs.next()) {
-	    siteHash.put(rs.getInt(1), rs.getString(2));
+	try {
+	    DataSource theDataSource = (DataSource) new InitialContext().lookup("java:/comp/env/jdbc/VIVOTagLib");
+	    Connection conn = theDataSource.getConnection();
+	    PreparedStatement stmt = conn.prepareStatement("select id,site from vivo_aggregated.site order by id");
+	    ResultSet rs = stmt.executeQuery();
+	    while (rs.next()) {
+	        siteHash.put(rs.getInt(1), rs.getString(2));
+	    }
+	    stmt.close();
+	    conn.close();
+	} catch (javax.naming.NameNotFoundException e) {
+	    logger.error("SiteIDIterator dataSource lookup failed");
 	}
-	stmt.close();
-	conn.close();
     }
 
     public int doStartTag() throws JspException {

src/main/java/edu/uiowa/slis/graphtaglib/filters/EdgeLookup.java

@@ -28,7 +28,7 @@ public int doStartTag() throws JspException {
 	try {
 	    this.cls = Class.forName(this.edgeLocator);
 	    Constructor<?> con = this.cls.getConstructor(String.class);
-	    this.edgeGen = (EdgePopulator) con.newInstance("java:/comp/env/jdbc/VIVOTagLib");
+	    this.edgeGen = (EdgePopulator) con.newInstance(dataSource);
 	} catch (Exception e) {
 	    e.printStackTrace();
 	}