r4896 - trunk/lib/style/skins/first

[leinfelder at ecoinformatics.org]

Author: leinfelder
Date: 2009-04-02 17:20:28 -0700 (Thu, 02 Apr 2009)
New Revision: 4896

Modified:
   trunk/lib/style/skins/first/download.jsp
Log:
use "recordNum" rather than "studentId"

Modified: trunk/lib/style/skins/first/download.jsp
===================================================================
--- trunk/lib/style/skins/first/download.jsp	2009-04-03 00:00:00 UTC (rev 4895)
+++ trunk/lib/style/skins/first/download.jsp	2009-04-03 00:20:28 UTC (rev 4896)
@@ -55,7 +55,7 @@
 		return params;
 	}
 %><%!
-	private List processResultsSet(ResultSet rs, int omitColumn) throws SQLException {
+	private List processResultsSet(ResultSet rs, int omitColumn, String omitColumnLabel) throws SQLException {
 		List retTable = new ArrayList();
 		int colCount = rs.getMetaData().getColumnCount();
 		List columnHeaders = new ArrayList();
@@ -66,11 +66,8 @@
 			List row = new ArrayList();
 			//get the values for this row
 			for (int i = 1; i <= colCount; i++) {
-				if (recordCount == 1) {
-					String colName = rs.getMetaData().getColumnName(i);
-					columnHeaders.add(colName);
-				}
-				
+
+				String colName = rs.getMetaData().getColumnName(i);
 				String value = rs.getString(i);
 					
 				//clean up the value
@@ -84,7 +81,11 @@
 					}
 					uniqueIds.put(value, lookupValue);
 					value = lookupValue;
+					colName = omitColumnLabel;
 				}
+				if (recordCount == 1) {
+					columnHeaders.add(colName);
+				}
 				
 				row.add(value);
 			}
@@ -416,7 +417,7 @@
 					List transposedTable = transpose(rs, observation, pivot, pivotCols, true);
 					csv.writeAll(transposedTable);
 				} else {
-					List processedTable = processResultsSet(rs, 3);
+					List processedTable = processResultsSet(rs, 3, "recordNum");
 					csv.writeAll(processedTable);
 				}