Changeset 80 for Dev/trunk

Timestamp:

08/09/11 14:48:35 (14 years ago)

Author:

basvannuland

Message:

Application save load from db should work. styles not part of save yet.
More work on session save load

Location:

Dev/trunk

Files:

• applicationcreation.php (modified) (2 diffs)
• classes/ApplicationDatabaseInterface.php (modified) (2 diffs)
• classes/ApplicationRDFWriter.php (modified) (1 diff)
• classes/SessionDatabaseInterface.php (modified) (2 diffs)
• classes/SessionRDFReader.php (modified) (1 diff)
• classes/SurveyDatabaseInterface.php (modified) (1 diff)
• survey.php (modified) (2 diffs)
• surveycreation.php (modified) (1 diff)

Dev/trunk/applicationcreation.php

@@ -1 +1 @@
 <?php
 require 'classes/master.php';
+
+var_dump($_POST);
 
 if (is_null($_SESSION['username']))
@@ -16 +18 @@
         
     $applicationDBI = new ApplicationDatabaseInterface($id);
-    $applicationDBI->setApplicationInfo($application);
+    $applicationDBI->setApplicationInfo($_POST);
+}
+else if(isset($_POST['applicationTitle']))
+{
+    $title = $_POST['applicationTitle'];
+    $description = $_POST['applicationDescription'];
+    $application = new Application($title, $description);
+        
+    $applicationDBI = new ApplicationDatabaseInterface(null);
+    $applicationDBI->setApplicationInfo($_POST);
 }
 

Dev/trunk/classes/ApplicationDatabaseInterface.php

@@ -28 +28 @@
     public function setApplicationInfo($applicationInfo)
     {
-        $appTitle = $application['applicationTitle'];
-        $appDescription = $application['applicationDescription'];
-        $appStyle = $application['applicationStyle'];
+        $appTitle = $applicationInfo['applicationTitle'];
+        $appDescription = $applicationInfo['applicationDescription'];
+        $appStyle = null;
 
         $this->applicationRDFWriter->setApplicationInfo($appTitle, $appDescription, $appStyle);
@@ -56 +56 @@
 
         $resultApplication = $this->applicationRDFReader->readAllApplications();
-
-        for($aNumber = 0;$aNumber<=sizeof($resultApplication[0]);$aNumber++)
+        
+        for($aNumber = 0;$aNumber<sizeof($resultApplication[0]);$aNumber++)
         {
             $aID = substr($resultApplication[0][$aNumber]['?uid'],9,strlen($resultApplication[0][$aNumber]['?uid'])-11);
-            $aTitle = substr($resultApplication[1][$aNumber]['?title'],9,strlen($resultApplication[0][$aNumber]['?title'])-11);
+            $aTitle = substr($resultApplication[1][$aNumber]['?title'],9,strlen($resultApplication[1][$aNumber]['?title'])-11);
             $applicationInfo[$aID] = $aTitle;
         }               

Dev/trunk/classes/ApplicationRDFWriter.php

@@ -15 +15 @@
 
         if(file_exists($this->fileName))
-        $this->model->load($this->fileName);
+            $this->model->load($this->fileName);
     }   
 
     public function saveApplications()
     {   
-        $this->model->saveAs($fileName,'rdf'); 
+        $this->model->saveAs($this->fileName,'rdf'); 
     }
 

Dev/trunk/classes/SessionDatabaseInterface.php

@@ -62 +62 @@
         
         foreach ($resultSession[1][1] as $surveyInfo) 
-         {
-            
+        {
+             $surveyUID = substr($surveyInfo['?uid'],9,strlen($surveyInfo['?uid'])-11);
+             $surveyIndex = substr($surveyInfo['?index'],9,strlen($surveyInfo['?index'])-11);
+             $sessionInfo[$surveyIndex . 's'] = $surveyUID;
+        }
+        foreach ($resultSession[1][2] as $applicationInfo) 
+        {
+             $applicationUID = substr($applicationInfo['?uid'],9,strlen($applicationInfo['?uid'])-11);
+             $applicationIndex = substr($applicationInfo['?index'],9,strlen($applicationInfo['?index'])-11);
+             $sessionInfo[$applicationIndex . 'a'] = $applicationUID;
+        }
+        foreach ($resultSession[1][3] as $dashboardInfo) 
+        {
+             $dashboardUID = substr($dashboardInfo['?uid'],9,strlen($dashboardInfo['?uid'])-11);
+             $dashboardIndex = substr($dashboardInfo['?index'],9,strlen($dashboardInfo['?index'])-11);
+             $sessionInfo[$dashboardIndex . 's'] = $dashboardUID;
         }
     }
@@ -69 +83 @@
     public function getExistingSessions()
     {
-        
+        $sessionIDs = array();
+        $sessions = array();
+
+        if($handle = opendir('data/sessions/'))
+        {
+            while (false !== ($file = readdir($handle))) {
+                if(strstr($file, 'session_'))
+                    $sessionIDs[] = substr($file,7,strlen($file)-11);
+            }
+        }
+
+        foreach($sessionIDs as $sessionID)
+        {
+            $sessionTitle = $this->sessionRDFReader->getSessionTitleByID($sessionID);
+            $$sessions[$sessionID] = substr($sessionTitle[0]['?title'],9,strlen($sessionTitle[0]['?title'])-11);
+        }
+
+        return $surveys;
     }
 }

Dev/trunk/classes/SessionRDFReader.php

@@ -112 +112 @@
         return $result;
     }
+    
+    public function getSessionTitleByID($sessionID)
+    {
+        // Create empty MemModel
+        $factory = new ModelFactory();
+        $tempmodel= $factory->getDefaultModel();
+        $tempmodel->load('data/sessions/session_'.$sessionID.'/session_'.$sessionID.'.rdf');
+
+        $querystring = '
+            PREFIX  predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
+            PREFIX  resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
+            SELECT  ?title 
+            WHERE       
+            {
+                    _session    predicates:resource_type        resources:session ;
+                                predicates:title                ?title  
+            }';
+
+        $result = $tempmodel->sparqlQuery($querystring);
+
+        return $result;
+    }
 }
 

Dev/trunk/classes/SurveyDatabaseInterface.php

@@ -120 +120 @@
         return $surveys;
     }
+    
+    public function getSurveyTitleByID($surveyID)
+    {
+        $surveyTitleLiteral = $this->surveyRDFReader->getSurveyTitleByID($surveyID);
+        $surveyTitle = substr($surveyTitle[0]['?title'],9,strlen($surveyTitle[0]['?title'])-11);
+        
+        return $surveyTitle;
+    }
 
 }

Dev/trunk/survey.php

@@ -2 +2 @@
 require 'classes/master.php';
 
-    var_dump($_POST);
+    //var_dump($_POST);
     
 if (is_null($_SESSION['username']))
@@ -16 +16 @@
     $savedSurvey = Survey::getSurvey($info);
     
-    //var_dump($_POST);
+    var_dump($_POST);
 }
 else

Dev/trunk/surveycreation.php

@@ -18 +18 @@
 }
 
-/* AUTOSAVE */ else if (isset($_POST['timeStamp'])) {
+/* AUTOSAVE */ 
+else if (isset($_POST['timeStamp'])) {
     $timeStamp = $_POST['timeStamp'];