Changeset 28 for Dev/trunk

Timestamp:

07/21/11 13:06:09 (14 years ago)

Author:

basvannuland

Message:

added uid to data return

Location:

Dev/trunk

Files:

• classes/SurveyDatabaseInterface.php (modified) (2 diffs)
• classes/SurveyRDFReader.php (modified) (3 diffs)
• classes/SurveyRDFWriter.php (modified) (4 diffs)
• rdfConstants.php (modified) (1 diff)
• surveycreation.php (modified) (1 diff)

Dev/trunk/classes/SurveyDatabaseInterface.php

@@ -10 +10 @@
 
 class SurveyDatabaseInterface
-{       
-    protected static $instance;
-        
+{               
         protected $surveyRDFWriter;
         protected $surveyRDFReader;
  
 
-    protected function __construct()
+    public function __construct($surveyID=null)
     {
-        //protected to prevent direct instantiation
-                $surveyUID = md5( uniqid(rand(), true) );
-                
+                if($surveyID == null)
+                        $surveyUID = md5( uniqid(rand(), true) );
+                else
+                        $surveyUID = $surveyID;
+                                        
                 $this->surveyRDFWriter = new SurveyRDFWriter($surveyUID);
                 $this->surveyRDFReader = new SurveyRDFReader($surveyUID);
     }
-
-        public static function getInstance() 
-    { 
-        if (!self::$instance) 
-        { 
-            self::$instance = new SurveyDatabaseInterface(); 
-        } 
-
-        return self::$instance; 
-    }
+                
+        public function __destruct() 
+        {
+                echo "Destroyed";
+        }
         
         public function setSurveyInfo($survey)
@@ -76 +71 @@
                 $resultSurvey = $this->surveyRDFReader->getSurveyInfo();
                 
+                $surveyInfo['surveyID'] = substr($resultSurvey[0][0]['?uid'],9,strlen($resultSurvey[0][0]['?uid'])-11);
                 $surveyInfo['surveyTitle'] = substr($resultSurvey[0][0]['?title'],9,strlen($resultSurvey[0][0]['?title'])-11);
                 $surveyInfo['surveyDescription'] = substr($resultSurvey[0][0]['?description'],9,strlen($resultSurvey[0][0]['?description'])-11);

Dev/trunk/classes/SurveyRDFReader.php

@@ -3 +3 @@
 class SurveyRDFReader
 {
-        var $model;
+        protected $model;
         
-        var $surveyUID;
+        protected $surveyUID;
         
     public function __construct($surveyUID)
@@ -18 +18 @@
         public function loadSurvey()
         {
-                $this->model->load('surveys/'.$this->surveyUID.'.rdf');
+                $this->model->load('surveys/survey_'.$this->surveyUID.'.rdf');
         }
         
@@ -37 +37 @@
                         PREFIX  predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
                         PREFIX  resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-                        SELECT  ?title ?description
+                        SELECT  ?uid ?title ?description 
                         WHERE   
                         {
                                 _survey         predicates:resource_type        resources:survey ;
-                                                        predicates:title                        ?title ;
-                                                        predicates:description          ?description
+                                                        predicates:uid                          ?uid    ;
+                                                        predicates:title                        ?title  ;
+                                                        predicates:description          ?description 
                         }';
                         

Dev/trunk/classes/SurveyRDFWriter.php

@@ -3 +3 @@
 class SurveyRDFWriter 
 {
-        var $model;
+        protected $model;
                 
-        var $resourceSurvey;
-        var $surveyUID;
+        protected $resourceSurvey;
+        protected $surveyUID;
         
     public function __construct($surveyUID)
@@ -16 +16 @@
                 $this->surveyUID = $surveyUID;
                 
-    }
+    }   
+        
+        public function saveSurvey()
+        {       
+                $this->model->saveAs('surveys/survey_'.$this->surveyUID.'.rdf','rdf');
+        }
         
         public function createSurvey($sTitle, $sDescription)
@@ -36 +41 @@
                 $predicateDescription = new Resource(DESCRIPTION);
                 $surveyDescription = new Literal($sDescription);
-                $this->model->add(new Statement($this->resourceSurvey,$predicateDescription,$surveyDescription));
-                
+                $this->model->add(new Statement($this->resourceSurvey,$predicateDescription,$surveyDescription));               
         }
         
@@ -89 +93 @@
                 
                 $predicateQuestion = new Resource(HAS_QUESTION);
-                $this->model->add(new Statement($this->resourceSurvey,$predicateQuestion,$resourceQuestion));
-                
+                $this->model->add(new Statement($this->resourceSurvey,$predicateQuestion,$resourceQuestion));           
         }
-        
-        public function saveSurvey()
-        {       
-                $this->model->saveAs('surveys/'.$this->surveyUID.'.rdf','rdf');
-        }
-
 }
 

Dev/trunk/rdfConstants.php

@@ -26 +26 @@
 define('NUMBER_OF_ANSWERS',SURVEYTOOL_PREDICATES_NAMESPACE . 'number_of_answers');
 define('SCALE',SURVEYTOOL_PREDICATES_NAMESPACE . 'scale');
+define('ANSWERED',SURVEYTOOL_PREDICATES_NAMESPACE . 'answered');
 
 // Arry with types of survey questions

Dev/trunk/surveycreation.php

@@ -7 +7 @@
         var_dump($_POST);
         echo '<br/><br/>';
-        $surveyDBI = SurveyDatabaseInterface::getInstance();
+        $surveyDBI =  new SurveyDatabaseInterface();
         $surveyDBI->setSurveyInfo($_POST);
         $info = $surveyDBI->getSurveyInfo();