Skip to content
Snippets Groups Projects
Commit 6ba0b57c authored by Christoph Thelen's avatar Christoph Thelen
Browse files

Use session keyword instead of id

parent dd2edcf2
No related merge requests found
...@@ -186,7 +186,12 @@ public class CouchDBDao implements IDatabaseDao { ...@@ -186,7 +186,12 @@ public class CouchDBDao implements IDatabaseDao {
} }
@Override @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 = ""; String viewName = "";
if(sort != null && sort.equals("text")) { if(sort != null && sort.equals("text")) {
viewName = "skill_question/by_session_sorted_by_subject_and_text"; viewName = "skill_question/by_session_sorted_by_subject_and_text";
...@@ -195,9 +200,9 @@ public class CouchDBDao implements IDatabaseDao { ...@@ -195,9 +200,9 @@ public class CouchDBDao implements IDatabaseDao {
} }
try { try {
View view = new View(viewName); View view = new View(viewName);
view.setStartKey("[" + URLEncoder.encode("\"" + session + "\"", "UTF-8") + "]"); view.setStartKey("[" + URLEncoder.encode("\"" + session.get_id() + "\"", "UTF-8") + "]");
view.setEndKey("[" + URLEncoder.encode("\"" + session + "\",{}", "UTF-8") + "]"); view.setEndKey("[" + URLEncoder.encode("\"" + session.get_id() + "\",{}", "UTF-8") + "]");
ViewResults questions = this.getDatabase().view(view); ViewResults questions = this.getDatabase().view(view);
if(questions == null || questions.isEmpty()) { if(questions == null || questions.isEmpty()) {
return null; return null;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment