From ead69b777d61f4f7226a81e29af2286fb8b69675 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Thu, 7 Feb 2013 18:05:46 +0100
Subject: [PATCH] Questions are sorted and returned in full
---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index ef96970be..3fc04e236 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -218,17 +218,15 @@ public class CouchDBDao implements IDatabaseDao {
try {
if (session.getCreator().equals(user.getUsername())) {
view = new View("skill_question/by_session_sorted_by_subject_and_text");
- view.setStartKey("[" + URLEncoder.encode("\"" + session.get_id() + "\"", "UTF-8") + "]");
- view.setEndKey("[" + URLEncoder.encode("\"" + session.get_id() + "\",{}", "UTF-8") + "]");
-
} else {
if (user.getType().equals(User.THM)) {
- view = new View("skill_question/by_session_for_thm");
+ view = new View("skill_question/by_session_for_thm_full");
} else {
- view = new View("skill_question/by_session_for_all");
+ view = new View("skill_question/by_session_for_all_full");
}
- view.setKey(URLEncoder.encode("\"" + session.get_id() + "\"", "UTF-8"));
}
+ view.setStartKey("[" + URLEncoder.encode("\"" + session.get_id() + "\"", "UTF-8") + "]");
+ view.setEndKey("[" + URLEncoder.encode("\"" + session.get_id() + "\",{}", "UTF-8") + "]");
ViewResults questions = this.getDatabase().view(view);
if (questions == null || questions.isEmpty()) {
@@ -968,10 +966,10 @@ public class CouchDBDao implements IDatabaseDao {
"[" + URLEncoder.encode("\"" + user.getUsername() + "\",\"" + s.get_id() + "\"", "UTF-8") + "]"
);
ViewResults results = this.getDatabase().view(view);
+ List<Answer> answers = new ArrayList<Answer>();
if (results.getResults().isEmpty()) {
- throw new NotFoundException();
+ return answers;
}
- List<Answer> answers = new ArrayList<Answer>();
for (Document d : results.getResults()) {
Answer a = (Answer) JSONObject.toBean(d.getJSONObject().getJSONObject("value"), Answer.class);
a.set_id(d.getId());
--
GitLab