1 files changed, 25 insertions, 4 deletions
diff --git a/yaksh/views.py b/yaksh/views.py
index 63653e6..6929ced 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -16,6 +16,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import Group
 from django.forms.models import inlineformset_factory
 from django.utils import timezone
+from django.core.exceptions import MultipleObjectsReturned
 import pytz
 from taggit.models import Tag
 from itertools import chain
@@ -25,7 +26,8 @@ import six
 # Local imports.
 from yaksh.models import get_model_class, Quiz, Question, QuestionPaper, QuestionSet, Course
 from yaksh.models import Profile, Answer, AnswerPaper, User, TestCase, FileUpload,\
-                        has_profile, StandardTestCase, McqTestCase, StdIOBasedTestCase, HookTestCase
+                          has_profile, StandardTestCase, McqTestCase,\
+                          StdIOBasedTestCase, HookTestCase, IntegerTestCase
 from yaksh.forms import UserRegisterForm, UserLoginForm, QuizForm,\
                 QuestionForm, RandomQuestionForm,\
                 QuestionFilterForm, CourseForm, ProfileForm, UploadFileForm,\
@@ -464,6 +466,21 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
         # Add the answer submitted, regardless of it being correct or not.
         if current_question.type == 'mcq':
             user_answer = request.POST.get('answer')
+        elif current_question.type == 'integer':
+            try:
+                user_answer = int(request.POST.get('answer'))
+            except ValueError:
+                msg = ["Please enter an Integer Value"]
+                return show_question(request, current_question, paper, msg)
+        elif current_question.type == 'float':
+            try:
+                user_answer = float(request.POST.get('answer'))
+            except ValueError:
+                msg = ["Please enter a Decimal Value"]
+                return show_question(request, current_question, paper, msg)
+        elif current_question.type == 'string':
+            user_answer = str(request.POST.get('answer'))
+
         elif current_question.type == 'mcc':
             user_answer = request.POST.getlist('answer')
         elif current_question.type == 'upload':
@@ -491,9 +508,13 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
         # If we were not skipped, we were asked to check.  For any non-mcq
         # questions, we obtain the results via XML-RPC with the code executed
         # safely in a separate process (the code_server.py) running as nobody.
-        json_data = current_question.consolidate_answer_data(user_answer) \
-                        if current_question.type == 'code' else None
-        result = paper.validate_answer(user_answer, current_question, json_data)
+        try:
+            json_data = current_question.consolidate_answer_data(user_answer) \
+                            if current_question.type == 'code' else None
+            result = paper.validate_answer(user_answer, current_question, json_data)
+        except MultipleObjectsReturned:
+            msg = ["Multiple objects returned. Contact admin."]
+            return show_question(request, current_question, paper, msg)
         if result.get('success'):
             new_answer.marks = (current_question.points * result['weight'] / 
                 current_question.get_maximum_test_case_weight()) \