Project

General

Profile

Revision 5087

correct the metadata matrix for "transposed" data download
http://bugzilla.ecoinformatics.org/show_bug.cgi?id=4452

View differences:

lib/style/skins/first/download.jsp
114 114
		//all vocab names/values
115 115
		List allVocabNames = new ArrayList();
116 116
		List allVocabValues = new ArrayList();
117
		boolean twoColumnMetadata = true;
117
		boolean twoColumnMetadata = false;
118 118
		
119 119
		int colCount = rs.getMetaData().getColumnCount();
120 120
		String idColName = rs.getMetaData().getColumnName(idCol);
......
295 295
					//check to see if this question has that keyword
296 296
					List names = (List) vocabNames.get(pivotValue);
297 297
					List values = (List) vocabValues.get(pivotValue);
298
					if (names != null && names.indexOf(vocabName) > -1 && names.indexOf(vocabName) == values.indexOf(vocabValue) ) {
299
						vocabRow.add("true");
298
					String containsVocabItem = "false";
299
					if (names != null) {
300
						int vocabNameIndex = names.indexOf(vocabName); 
301
						int vocabValueIndex = values.indexOf(vocabValue);
302
						// contains the vocab and the value _somewhere_
303
						if (vocabNameIndex > -1 && vocabValueIndex > -1) {
304
							containsVocabItem = "true";
305
						}
300 306
					}
301
					else {
302
						vocabRow.add("false");
303
					}
307
					vocabRow.add(containsVocabItem);
304 308
				}
305 309
				lastPivotValue = pivotValue;
306 310
			}

Also available in: Unified diff