Changeset 91 for Dev/trunk

Timestamp:

08/30/11 17:49:19 (14 years ago)

Author:

basvannuland

Message:

start with dashboard database

Location:

Dev/trunk

Files:

• classes/ApplicationDatabaseInterface.php (modified) (1 diff)
• classes/DashboardCreationDatabaseInterface.php (added)
• classes/DashboardRDFReader.php (added)
• classes/DashboardRDFWriter.php (added)
• classes/QuestionRDFReader.php (modified) (1 diff)
• classes/SurveyAnswerDatabaseInterface.php (modified) (1 diff)
• classes/SurveyCreationDatabaseInterface.php (modified) (2 diffs)
• classes/SurveyCreationTool.php (modified) (1 diff)
• classes/SurveyRDFReader.php (modified) (1 diff)
• doc/TODO (modified) (1 diff)
• rdfConstants.php (modified) (2 diffs)
• sessioncreation.php (modified) (1 diff)

Dev/trunk/classes/ApplicationDatabaseInterface.php

@@ -63 +63 @@
 
         $resultApplication = $this->applicationRDFReader->readAllApplications();
-        
-        for($aNumber = 0;$aNumber<sizeof($resultApplication[0]);$aNumber++)
+        if($resultApplication[0] != false)
         {
-            $aID = $resultApplication[0][$aNumber]['?uid']->label;
-            $aTitle = $resultApplication[1][$aNumber]['?title']->label;
-            $applicationInfo[$aID] = $aTitle;
-        }               
+            for($aNumber = 0;$aNumber<sizeof($resultApplication[0]);$aNumber++)
+            {
+                $aID = $resultApplication[0][$aNumber]['?uid']->label;
+                $aTitle = $resultApplication[1][$aNumber]['?title']->label;
+                $applicationInfo[$aID] = $aTitle;
+            }
+        }
 
         return $applicationInfo;

Dev/trunk/classes/QuestionRDFReader.php

@@ -69 +69 @@
         return $result; 
     }
+    
+    public function readQuestionCodes()
+    {
+        $result = null;
+        
+        if(file_exists($this->filePath.'questions.rdf'))
+        {
+            // Create empty MemModel
+            $factory = new ModelFactory();
+            $tempmodel= $factory->getDefaultModel();
+            $tempmodel->load($this->filePath.'questions.rdf');
+
+            $querystring = '
+            PREFIX      predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
+            PREFIX      resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
+            SELECT      ?questionCode
+            WHERE 
+            {   
+                    _question   predicates:resource_type        resources:question ;
+                                predicates:question_code        ?questionCode                           
+            }';
+            
+            $result = $tempmodel->sparqlQuery($querystring);
+        }
+        return $result; 
+    }
 
     public function readQuestionTitle($questionID)

Dev/trunk/classes/SurveyAnswerDatabaseInterface.php

@@ -5 +5 @@
 // Include RAP Library to write RDF files
 include(RDFAPI_INCLUDE_DIR . "RDFAPI.php");
-
-
 
 class SurveyAnswerDatabaseInterface extends SurveyCreationDatabaseInterface

Dev/trunk/classes/SurveyCreationDatabaseInterface.php

@@ -94 +94 @@
         }
         
-        if(!$this->checkQuestionIDExists($qID))
-        {
+        if($this->checkQuestionCodeExists($qCode))
+        {
+            return 'Question code (' . $qCode . ') already in use. Please try a new code.';
+        }
+        else if($this->checkQuestionIDExists($qID))
+        {
+            return 'Question already exists';
+        }
+        else {
             $this->questionRDFWriter->createQuestion($qTitle,$qDescription,$qType,$qID,"null","null",$qAnswers);
+            return 'Question saved';
         }
     }
@@ -201 +209 @@
         return $result;
     }
+    
+    public function checkQuestionCodeExists($qCode)
+    {
+        $result = false;
+
+        $questionCodes = $this->questionRDFReader->readQuestionCodes();
+        
+        if ($questionCodes != null)
+        {
+            foreach($questionCodes as $questionCode)
+            {
+                $code = $questionCode['?questionCode']->label;
+                if(!strcmp($code ,$qCode))
+                {
+                    $result = true;
+                    break;
+                }
+            }
+        }
+
+        return $result;
+    }
 }
 ?>

Dev/trunk/classes/SurveyCreationTool.php

@@ -15 +15 @@
         $this->survey = $survey;
         $this->timeStamp = $timeStamp;
-        var_dump($_POST);
-        var_dump($survey);
         if (isset($this->survey->id))
             SurveyCreationTool::javascript($this->survey->id);

Dev/trunk/classes/SurveyRDFReader.php

@@ -20 +20 @@
     public function loadSurvey()
     {
-        $this->model->load($this->filePath);
+        if(file_exists($this->filePath))
+        {
+            $this->model->load($this->filePath);
+            return true;
+        }
+        else
+        {
+            return false;
+        }
     }
 

Dev/trunk/doc/TODO

@@ -11 +11 @@
     Load existing question
     Question code
+    Question category
 
 Application Load / Edit

Dev/trunk/rdfConstants.php

@@ -10 +10 @@
 
 // Resource used for RDF triples
+define('USER',SURVEYTOOL_RESOURCES_NAMESPACE . 'user');
 define('SURVEY',SURVEYTOOL_RESOURCES_NAMESPACE . 'survey');
+define('QUESTION',SURVEYTOOL_RESOURCES_NAMESPACE . 'question');
 define('APPLICATION',SURVEYTOOL_RESOURCES_NAMESPACE . 'application');
 define('SESSION',SURVEYTOOL_RESOURCES_NAMESPACE . 'session');
 define('DASHBOARD',SURVEYTOOL_RESOURCES_NAMESPACE . 'dashboard');
-define('USER',SURVEYTOOL_RESOURCES_NAMESPACE . 'user');
-define('QUESTION',SURVEYTOOL_RESOURCES_NAMESPACE . 'question');
-define('ANSWER',SURVEYTOOL_RESOURCES_NAMESPACE . 'answer');
+define('GRAPH',SURVEYTOOL_RESOURCES_NAMESPACE . 'graph');
 
 // Predicates used for RDF triples
 define('UID',SURVEYTOOL_PREDICATES_NAMESPACE . 'uid');
-define('CREATOR',SURVEYTOOL_PREDICATES_NAMESPACE . 'creator');
 define('NAME',SURVEYTOOL_PREDICATES_NAMESPACE . 'name');
 define('PASSWORD',SURVEYTOOL_PREDICATES_NAMESPACE . 'password');
+define('CREATOR',SURVEYTOOL_PREDICATES_NAMESPACE . 'creator');
 define('TITLE',SURVEYTOOL_PREDICATES_NAMESPACE . 'title');
 define('DESCRIPTION',SURVEYTOOL_PREDICATES_NAMESPACE . 'description');
@@ -30 +30 @@
 define('QTYPE',SURVEYTOOL_PREDICATES_NAMESPACE . 'question_type');
 define('QCODE',SURVEYTOOL_PREDICATES_NAMESPACE . 'question_code');
+define('ANSWERED',SURVEYTOOL_PREDICATES_NAMESPACE . 'answered');
+define('RESPONDENT',SURVEYTOOL_PREDICATES_NAMESPACE . 'respondent');
 define('QCATEGORY',SURVEYTOOL_PREDICATES_NAMESPACE . 'question_category');
 define('HAS_QUESTION',SURVEYTOOL_PREDICATES_NAMESPACE . 'has_question');
 define('HAS_ANSWER',SURVEYTOOL_PREDICATES_NAMESPACE . 'has_answer');
-define('ANSWERED',SURVEYTOOL_PREDICATES_NAMESPACE . 'answered');
-define('RESPONDENT',SURVEYTOOL_PREDICATES_NAMESPACE . 'respondent');
+define('HAS_GRAPH',SURVEYTOOL_PREDICATES_NAMESPACE . 'has_graph');
 define('HAS_PROCESS',SURVEYTOOL_PREDICATES_NAMESPACE . 'has_process');
 define('INDEX',SURVEYTOOL_PREDICATES_NAMESPACE . 'index');
+define('GRAPH_TYPE',SURVEYTOOL_PREDICATES_NAMESPACE . 'graph_type');
+define('DATA',SURVEYTOOL_PREDICATES_NAMESPACE . 'data');
 
 ?>

Dev/trunk/sessioncreation.php

@@ -4 +4 @@
 if (is_null($_SESSION['username']))
     redirect('index.php');
-
-var_dump($_POST);
 
 /* LOAD SURVEY */