Changeset 45 for Dev/trunk/classes

Timestamp:

07/25/11 15:11:23 (14 years ago)

Author:

basvannuland

Message:

new file structure. surveys/users/application DBs in data folder

Location:

Dev/trunk/classes

Files:

• ApplicationDatabaseInterface.php (modified) (1 diff)
• ApplicationRDFReader.php (modified) (1 diff)
• ApplicationRDFWriter.php (modified) (1 diff)
• SurveyAnswerDatabaseInterface.php (modified) (1 diff)
• SurveyAnswerRDFReader.php (modified) (6 diffs)
• SurveyAnswerRDFWriter.php (modified) (2 diffs)
• SurveyDatabaseInterface.php (modified) (1 diff)
• SurveyRDFReader.php (modified) (3 diffs)
• SurveyRDFWriter.php (modified) (3 diffs)
• UserRDFReader.php (modified) (2 diffs)
• UserRDFWriter.php (modified) (1 diff)

Dev/trunk/classes/ApplicationDatabaseInterface.php

@@ -2 +2 @@
 
 // Survey database interface class as intermediate for storing data from the site to the RDF database 
-require 'rdfConstants.php';
+require_once 'rdfConstants.php';
 
 // Include RAP Library to write RDF files
-define("RDFAPI_INCLUDE_DIR", "rdfapi/");
 include(RDFAPI_INCLUDE_DIR . "RDFAPI.php");
 

Dev/trunk/classes/ApplicationRDFReader.php

@@ -11 +11 @@
                 $this->model = $factory->getDefaultModel();
                 
-                $fileName = 'applications/applications.rdf';
+                $fileName = 'data/applications/applications.rdf';
                 
                 if(file_exists($fileName))

Dev/trunk/classes/ApplicationRDFWriter.php

@@ -4 +4 @@
 {
         protected $model;
-        protected $fileName = 'applications/applications.rdf';
+        protected $fileName = 'data/applications/applications.rdf';
 
         public function __construct($applicationID)

Dev/trunk/classes/SurveyAnswerDatabaseInterface.php

@@ -2 +2 @@
 
 // Survey class as intermediate for storing data from the site to the RDF database 
-require 'rdfConstants.php';
+require_once 'rdfConstants.php';
 
 // Include RAP Library to write RDF files
-define("RDFAPI_INCLUDE_DIR", "rdfapi/");
 include(RDFAPI_INCLUDE_DIR . "RDFAPI.php");
 

Dev/trunk/classes/SurveyAnswerRDFReader.php

@@ -4 +4 @@
 {       
         protected $tempModel;
+        protected $answerPath
         
     public function __construct($surveyUID)
@@ -12 +13 @@
                 $factory = new ModelFactory();
                 $this->tempModel = $factory->getDefaultModel();
+                $this->answerPath = 'data/surveys/answers_'.$this->surveyUID;
         }
         
@@ -24 +26 @@
                 $this->tempModel->loadModel($this->model);
                 
-                $answerPath = 'surveys/answers_'.$this->surveyUID;
                 $answers = array();
                 
-                if($handle = opendir('$answerPath'))
+                if($handle = opendir($this->answerPath))
                 {
                         while (false !== ($file = readdir($handle))) {
@@ -37 +38 @@
                 foreach($answers as $answer)
                 {
-                        $this->tempModel->load($answerPath.'/'.$answer);
+                        $this->tempModel->load($this->answerPath.'/'.$answer);
                 }
                 
@@ -66 +67 @@
                 $this->tempModel->loadModel($this->model);
                 
-                $answerPath = 'surveys/answers_'.$this->surveyUID;
-                
-                $this->tempModel->load($answerPath . '/$answer_' . $respondentID);
+                $this->tempModel->load($this->answerPath . '/$answer_' . $respondentID);
                 
                 $this->tempModel->visualize();
@@ -94 +93 @@
         {
                 $this->tempModel->loadModel($this->model);
-                
-                $answerPath = 'surveys/answers_'.$this->surveyUID;
-                
-                $this->tempModel->load($answerPath . '/$answer_' . $respondentID);
+                                
+                $this->tempModel->load($this->answerPath . '/$answer_' . $respondentID);
                 
                 $this->tempModel->visualize();

Dev/trunk/classes/SurveyAnswerRDFWriter.php

@@ -4 +4 @@
 {
         protected $userUID;
+        protected $answerPath
 
         public function __construct($surveyUID,$userUID)
@@ -10 +11 @@
                 
                 $this->userUID = $userUID;
+                $this->answerPath = 'data/surveys/answers_'.$this->surveyUID;
     }
         
         public function saveSurvey()
         {       
-                $answerPath = 'surveys/answers_'.$this->surveyUID;
-                if (!is_dir($answerPath))
-                        mkdir($answerPath);             
-                $this->model->saveAs($answerPath.'/answer_'.$this->userUID.'.rdf','rdf');
+                if (!is_dir($this->answerPath))
+                        mkdir($this->answerPath);               
+                $this->model->saveAs($this->answerPath.'/answer_'.$this->userUID.'.rdf','rdf');
         }
         
         public function setRespondentData($name)
         {                               
-                $resourceUser = new Resource(USER);
+                $resourceUser = new Resource(USER . '/' . $userID);             
+                
+                $resourceUserType = new Resource(USER);
+                $predicateRType = new Resource(RTYPE);
+                $this->model->add(new Statement($resourceUser,$predicateRType,$resourceUserType));
                 
                 $LiteralUserName = new Literal($name);

Dev/trunk/classes/SurveyDatabaseInterface.php

@@ -99 +99 @@
                 $surveys = array();
         
-                if($handle = opendir('surveys/'))
+                if($handle = opendir('data/surveys/'))
                 {
                         while (false !== ($file = readdir($handle))) {

Dev/trunk/classes/SurveyRDFReader.php

@@ -6 +6 @@
         
         protected $surveyUID;
+        protected $filePath;
         
     public function __construct($surveyUID)
@@ -14 +15 @@
                 
                 $this->surveyUID = $surveyUID;
+                $this->filePath = 'data/surveys/survey_'.$this->surveyUID.'.rdf';
         }
         
         public function loadSurvey()
         {
-                $this->model->load('surveys/survey_'.$this->surveyUID.'.rdf');
+                $this->model->load($this->filePath);
         }
         
@@ -155 +157 @@
                 $factory = new ModelFactory();
                 $tempmodel= $factory->getDefaultModel();
-                $tempmodel->load('surveys/survey_'.$surveyID.'.rdf');
+                $tempmodel->load('data/surveys/survey_'.$surveyID.'.rdf');
                 
                 $querystring = '

Dev/trunk/classes/SurveyRDFWriter.php

@@ -7 +7 @@
         protected $resourceSurvey;
         protected $surveyUID;
+        protected $filePath;
         
     public function __construct($surveyUID)
@@ -15 +16 @@
                 
                 $this->surveyUID = $surveyUID;
+                $this->filePath = 'data/surveys/survey_'.$this->surveyUID.'.rdf';
                 
     }   
@@ -20 +22 @@
         public function saveSurvey()
         {       
-                $this->model->saveAs('surveys/survey_'.$this->surveyUID.'.rdf','rdf');
+                $this->model->saveAs($this->filePath);
         }
         

Dev/trunk/classes/UserRDFReader.php

@@ -4 +4 @@
 {
         protected $model;
+        protected $fileName = 'data/users/users.rdf';
                         
     public function __construct()
@@ -11 +12 @@
                 $this->model = $factory->getDefaultModel();
                 
-                $fileName = 'users/users.rdf';
                 
-                if(file_exists($fileName))
-                        $this->model->load($fileName);
+                if(file_exists($this->fileName))
+                        $this->model->load($this->fileName);
     }
         

Dev/trunk/classes/UserRDFWriter.php

@@ -5 +5 @@
 
         protected $model;
-        protected $fileName = 'users/users.rdf';
+        protected $fileName = 'data/users/users.rdf';
                         
     public function __construct()