Project

General

Profile

« Previous | Next » 

Revision 4898

do not duplicate the true/false indicators for the metadata vocab/value matrix

View differences:

lib/style/skins/first/download.jsp
273 273
				vocabRow.add(key);
274 274
			}
275 275
			//go through the questions now, again
276
			String lastPivotValue = "";
276 277
			headerIter = header.iterator();
277 278
			while (headerIter.hasNext()) {
278 279
				String column = (String) headerIter.next();
......
285 286
				if (pivotValue == null) {
286 287
					continue;
287 288
				}
288
				//check to see if this question has that keyword
289
				List names = (List) vocabNames.get(pivotValue);
290
				List values = (List) vocabValues.get(pivotValue);
291
				if (names != null && names.indexOf(vocabName) > -1 && names.indexOf(vocabName) == values.indexOf(vocabValue) ) {
292
					vocabRow.add("true");
289
				//check to not duplicate values
290
				if (pivotValue.equals(lastPivotValue)) {
291
					vocabRow.add(null);
293 292
				}
294 293
				else {
295
					vocabRow.add("false");
294
					//check to see if this question has that keyword
295
					List names = (List) vocabNames.get(pivotValue);
296
					List values = (List) vocabValues.get(pivotValue);
297
					if (names != null && names.indexOf(vocabName) > -1 && names.indexOf(vocabName) == values.indexOf(vocabValue) ) {
298
						vocabRow.add("true");
299
					}
300
					else {
301
						vocabRow.add("false");
302
					}
296 303
				}
304
				lastPivotValue = pivotValue;
297 305
			}
298 306
			//put the row on
299 307
			vocabTable.add(vocabRow.toArray(new String[0]));

Also available in: Unified diff