Changeset 113

Timestamp:

09/19/11 16:52:43 (14 years ago)

Author:

basvannuland

Message:

question creation getinfo fixed

Location:

Dev/trunk/classes

Files:

• QuestionCreationDatabaseInterface.php (modified) (1 diff)
• QuestionRDFReader.php (modified) (3 diffs)

Dev/trunk/classes/QuestionCreationDatabaseInterface.php

@@ -56 +56 @@
         $questionInfo = array();
         
-        $questionTitleObject = $this->questionRDFReader->readQuestionTitle($qCode);
-        $questionInfo['questionTitle'] = $questionTitleObject[0]['?questionTitle']->label;
-
-        $questionDescriptionObject = $this->questionRDFReader->readQuestionDescription($qCode);
-        $questionInfo['questionDescription'] = $questionDescriptionObject[0]['?questionDescription']->label;
-
-        $questionTypeObject = $this->questionRDFReader->readQuestionType($qCode);
-        $questionInfo['questionType'] = $questionTypeObject[0]['?questionType']->label;
+        $question = $this->questionRDFReader->readQuestionByCode($qCode);
         
-        $questionCategoryObject = $this->questionRDFReader->readQuestionCategory($qCode);
-        $questionInfo['questionCategory'] = $questionTypeObject[0]['?questionCategory']->label;
-
-        $resultAnswers = $this->questionRDFReader->readQuestionAnswers($qCode);
-
-        if ($resultAnswers != null)
+        $questionInfo['questionTitle'] = $question['title'][0]['?questionTitle']->label;
+        $questionInfo['questionDescription'] = $question['description'][0]['?questionDescription']->label;
+        $questionInfo['questionType'] = $question['type'][0]['?questionType']->label;
+        $questionInfo['questionCategory'] = $question['category'][0]['?questionCategory']->label;
+        if ($question['answers'] != null)
         {
-            for($aNumber = 1;$aNumber<=sizeof($resultAnswers);$aNumber++)
+            for($aNumber = 1;$aNumber<=sizeof($question['answers']);$aNumber++)
             {
-                $questionInfo['ans'.$aNumber] = $resultAnswers[$aNumber-1]['?answerDescription']->label;
+                $questionInfo['ans'.$aNumber] = $question['answers'][$aNumber-1]['?answerDescription']->label;
             }
         }

Dev/trunk/classes/QuestionRDFReader.php

@@ -16 +16 @@
         if (!is_dir($this->filePath))
             mkdir($this->filePath);     
-        
-    }
-    
-    public function loadQuestions()
-    {
-        if(file_exists($this->filePath.'questions.rdf'))
-        {
-            $this->model->load($this->filePath.'questions.rdf');
-            return true;
-        }
-        else
-        {
-            return false;
-        }
+        $this->reloadQuestions();
     }
     
@@ -50 +37 @@
         $result['description'] = $this->readQuestionDescription($questionCode);
         $result['type'] = $this->readQuestionType($questionCode);
-        $result['code'] = $this->readQuestionCode($questionCode);
         $result['category'] = $this->readQuestionCategory($questionCode);
         $result['answers'] = $this->readQuestionAnswers($questionCode);
@@ -92 +78 @@
             {
                     _question   predicates:resource_type        resources:question ;
-                                predicates:question_code    "' . $questionCode . '"  ;
+                                predicates:question_code        "' . $questionCode . '"  ;
                                 predicates:title                ?questionTitle          
             }';