From 6ba0b57c4fedacf6c6c380f36603153fce7702f1 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Wed, 17 Oct 2012 12:04:34 +0200
Subject: [PATCH] Use session keyword instead of id
---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index da671be68..dfad48aa0 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -186,7 +186,12 @@ public class CouchDBDao implements IDatabaseDao {
}
@Override
- public List<Question> getSkillQuestions(String session, String sort) {
+ public List<Question> getSkillQuestions(String sessionKeyword, String sort) {
+ Session session = this.getSessionFromKeyword(sessionKeyword);
+ if (session == null) {
+ return null;
+ }
+
String viewName = "";
if(sort != null && sort.equals("text")) {
viewName = "skill_question/by_session_sorted_by_subject_and_text";
@@ -195,9 +200,9 @@ public class CouchDBDao implements IDatabaseDao {
}
try {
View view = new View(viewName);
- view.setStartKey("[" + URLEncoder.encode("\"" + session + "\"", "UTF-8") + "]");
- view.setEndKey("[" + URLEncoder.encode("\"" + session + "\",{}", "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()) {
return null;
--
GitLab