Changes in Dev/trunk/classes/SurveyRDFWriter.php [28:16]

File:

• Dev/trunk/classes/SurveyRDFWriter.php (modified) (4 diffs)

Dev/trunk/classes/SurveyRDFWriter.php

@@ -3 +3 @@
 class SurveyRDFWriter 
 {
-        protected $model;
+        var $model;
                 
-        protected $resourceSurvey;
-        protected $surveyUID;
-        
-    public function __construct($surveyUID)
+        var $resourceSurvey;
+    /**
+    * Use SurveyRDFWriter::getInstance() instead of this
+    * constructor.
+    */
+    public function __construct()
     {
         // Create empty MemModel
@@ -14 +16 @@
                 $this->model = $factory->getDefaultModel();
                 
-                $this->surveyUID = $surveyUID;
+                $this->initResources();
+    }
+
+        function initResources()
+        {
                 
-    }   
-        
-        public function saveSurvey()
-        {       
-                $this->model->saveAs('surveys/survey_'.$this->surveyUID.'.rdf','rdf');
+                $this->resourceSurvey = new Resource(SURVEY);
         }
         
         public function createSurvey($sTitle, $sDescription)
         {               
-                $this->resourceSurvey = new Resource(SURVEY.'/'.$this->surveyUID);
-                
-                $resourceSurveyType = new Resource(SURVEY);
-                $predicateRType = new Resource(RTYPE);
-                $this->model->add(new Statement($this->resourceSurvey,$predicateRType,$resourceSurveyType));
-                
-                $literalSurveyID = new Literal($this->surveyUID);
-                $predicateUniqueID = new Resource(UID);
-                $this->model->add(new Statement($this->resourceSurvey,$predicateUniqueID,$literalSurveyID));
                 
                 $predicateTitle = new Resource(TITLE);          
@@ -46 +39 @@
         public function addQuestion($qTitle,$qDescription,$qType,$qAnswers)
         {
-                $questionID = md5( uniqid(rand(), true) );
-                $resourceQuestion = new Resource(QUESTION.'/'.$questionID);
-                                
-                $resourceQuestionType = new Resource(QUESTION);
-                $predicateRType = new Resource(RTYPE);
-                $this->model->add(new Statement($resourceQuestion,$predicateRType,$resourceQuestionType));
-                                
-                $predicateUniqueID = new Resource(UID);
-                $questionUID = new Literal($questionID);
-                $this->model->add(new Statement($resourceQuestion,$predicateUniqueID,$questionUID));
-                                
+                $resourceQuestion = new Resource(QUESTION);
+                $predicateQuestion = new Resource(HAS_QUESTION);
+                $this->model->add(new Statement($this->resourceSurvey,$predicateQuestion,$resourceQuestion));
+                
                 $predicateTitle = new Resource(TITLE);          
                 $questionTitle = new Literal($qTitle);
@@ -65 +51 @@
                 $this->model->add(new Statement($resourceQuestion,$predicateDescription,$questionDescription));         
                 
-                $predicateQType = new Resource(QTYPE);
-                $resourceQuestionType = new Literal($qType);
-                $this->model->add(new Statement($resourceQuestion,$predicateQType,$resourceQuestionType));
+                $predicateType = new Resource(TYPE);
+                $resourceQuestionType = new Resource(QUESTION_TYPE);
+                $this->model->add(new Statement($resourceQuestion,$predicateType,$resourceQuestionType));
                 
                 foreach($qAnswers as $answer)
-                {               
-                        $answerID = md5( uniqid(rand(), true) );        
-                        $resourceAnswer = new Resource(ANSWER.'/'.$answerID);
-                                
-                        $resourceAnswerType = new Resource(ANSWER);
-                        $predicateRType = new Resource(RTYPE);
-                        $this->model->add(new Statement($resourceAnswer,$predicateRType,$resourceAnswerType));  
-
-                        $predicateUniqueID = new Resource(UID);
-                        $answerUID = new Literal($answerID);
-                        $this->model->add(new Statement($resourceAnswer,$predicateUniqueID,$answerUID));                        
-                                                
+                {
+                        $resourceAnswer = new Resource(ANSWER);
+                        $predicateAnswer = new Resource(HAS_ANSWER);    
+                        $this->model->add(new Statement($resourceQuestion,$predicateAnswer,$resourceAnswer));
+                        
+                        $predicateTitle = new Resource(TITLE);
                         $answerTitle = new Literal($answer['Title']);
                         $this->model->add(new Statement($resourceAnswer,$predicateTitle,$answerTitle));
                         
+                        $predicateDescription = new Resource(DESCRIPTION);
                         $answerDescription = new Literal($answer['Description']);
                         $this->model->add(new Statement($resourceAnswer,$predicateDescription,$answerDescription));
                         
-                        $predicateAnswer = new Resource(HAS_ANSWER);    
-                        $this->model->add(new Statement($resourceQuestion,$predicateAnswer,$resourceAnswer));
                 }
                 
-                $predicateQuestion = new Resource(HAS_QUESTION);
-                $this->model->add(new Statement($this->resourceSurvey,$predicateQuestion,$resourceQuestion));           
+                
         }
+        
+        public function saveSurvey($sTitle)
+        {
+                $this->model->saveAs('surveys/'.$sTitle.'.rdf','rdf');
+                
+                return true;
+        }
+
 }