Merge of changes for #4026 and #4029.

src/main/java/de/thm/arsnova/dao/CouchDBDao.java

@@ -188,7 +188,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";
@@ -197,9 +202,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;

src/main/java/de/thm/arsnova/socket/message/Question.java

@@ -37,6 +37,8 @@ public class Question {
 	
 	private int number;	
 	private int duration;
+	private String _id;
+	private String _rev;
 	
 	
 	public String getType() {
@@ -135,6 +137,22 @@ public class Question {
 		this.duration = duration;
 	}
 
+	public String get_id() {
+		return _id;
+	}
+
+	public void set_id(String _id) {
+		this._id = _id;
+	}
+
+	public String get_rev() {
+		return _rev;
+	}
+
+	public void set_rev(String _rev) {
+		this._rev = _rev;
+	}
+
 	@Override
 	public String toString() {
 		return "Question type '" + this.questionType + "': " + this.subject + ";\n" + this.text +