Fixed a bug where selecting all prompt IDs under certain conditions w…

…ould cause a crash.
ohmage · Dec 17, 2011 · cfd2f46 · cfd2f46
1 parent 3ad5fe5
commit cfd2f46
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/org/ohmage/request/survey/SurveyResponseReadRequest.java b/src/org/ohmage/request/survey/SurveyResponseReadRequest.java
@@ -932,13 +932,21 @@ else if(OutputFormat.JSON_COLUMNS.equals(outputFormat) ||
 							}
 						}
 						else if(promptIds != null) {
-							int currNumPrompts = 0;
-							Map<Integer, SurveyItem> tempPromptMap = new HashMap<Integer, SurveyItem>(promptIds.size());
-							for(String promptId : promptIds) {
-								tempPromptMap.put(currNumPrompts, campaign.getPrompt(campaign.getSurveyIdForPromptId(promptId), promptId));
+							if(this.promptIds.equals(URN_SPECIAL_ALL_LIST)) {
+								for(Survey currSurvey : campaign.getSurveys().values()) {
+									populatePrompts(currSurvey.getSurveyItems(), prompts);
+								}
+							}
+							else {
+								int currNumPrompts = 0;
+								Map<Integer, SurveyItem> tempPromptMap = new HashMap<Integer, SurveyItem>(promptIds.size());
+								for(String promptId : promptIds) {
+									tempPromptMap.put(currNumPrompts, campaign.getPrompt(campaign.getSurveyIdForPromptId(promptId), promptId));
+									currNumPrompts++;
+								}
+
+								populatePrompts(tempPromptMap, prompts);
 							}
-
-							populatePrompts(tempPromptMap, prompts);
 						}
 					}
 					else {