Changeset 88 for Dev/trunk/classes

Timestamp:

08/30/11 15:25:32 (14 years ago)

Author:

basvannuland

Message:

application reader changed to work

Location:

Dev/trunk/classes

Files:

• ApplicationDatabaseInterface.php (modified) (2 diffs)
• ApplicationRDFReader.php (modified) (1 diff)
• ApplicationRDFWriter.php (modified) (2 diffs)

Dev/trunk/classes/ApplicationDatabaseInterface.php

@@ -49 +49 @@
 
         $resultApplication = $this->applicationRDFReader->readApplicationInfo($applicationID);
-
-        $applicationInfo['applicationID'] = substr($resultApplication['?uid'],9,strlen($resultApplication['?uid'])-11);
-        $applicationInfo['applicationTitle'] = substr($resultApplication['?title'],9,strlen($resultApplication['?title'])-11);
-        $applicationInfo['applicationDescription'] = substr($resultApplication['?description'],9,strlen($resultApplication['?description'])-11);
-        $applicationInfo['applicationStyle'] = substr($resultApplication['?style'],9,strlen($resultApplication['?style'])-11);
+        
+        $applicationInfo['applicationID'] = $applicationID;
+        $applicationInfo['applicationTitle'] = $resultApplication[0]['?title']->label;
+        $applicationInfo['applicationDescription'] = $resultApplication[0]['?description']->label;
+        $applicationInfo['applicationStyle'] = $resultApplication[0]['?style']->label;
 
         return $applicationInfo;
@@ -66 +66 @@
         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[1][$aNumber]['?title'])-11);
+            $aID = $resultApplication[0][$aNumber]['?uid']->label;
+            $aTitle = $resultApplication[1][$aNumber]['?title']->label;
             $applicationInfo[$aID] = $aTitle;
         }               

Dev/trunk/classes/ApplicationRDFReader.php

@@ -4 +4 @@
 {
     protected $model;
+    protected $fileName;
 
     public function __construct()
     {
-    // Create empty MemModel
-    $factory = new ModelFactory();
-    $this->model = $factory->getDefaultModel();
-
-    $fileName = 'data/applications/applications.rdf';
-
-    if(file_exists($fileName))
-        $this->model->load($fileName);
+        $this->fileName = 'data/applications/applications.rdf';
+    
+        $this->reloadApplications();
+    }
+    
+    public function reloadApplications()
+    {
+        // Create empty MemModel   
+        $factory = new ModelFactory();
+        $this->model = $factory->getDefaultModel();
+        
+        if(file_exists($this->fileName))
+            $this->model->load($this->fileName);
     }
 
     public function readApplicationInfo($applicationID)
-    {
+    {        
+        $this->reloadApplications();
+        
         $querystring = '
             PREFIX  predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>

Dev/trunk/classes/ApplicationRDFWriter.php

@@ -25 +25 @@
     public function setApplicationInfo($aTitle, $aDescription, $aStyle)
     {
-        $applicationID = md5( uniqid(rand(), true) );
-
-        $resourceApplication = new Resource(APPLICATION.'/'.$applicationID);
+        $resourceApplication = new Resource(APPLICATION.'/'.$this->applicationID);
 
         $resourceApplicationType = new Resource(APPLICATION);
@@ -33 +31 @@
         $this->model->add(new Statement($resourceApplication,$predicateRType,$resourceApplicationType));
 
-        $literalApplicationID = new Literal($applicationID);
+        $literalApplicationID = new Literal($this->applicationID);
         $predicateUniqueID = new Resource(UID);
         $this->model->add(new Statement($resourceApplication,$predicateUniqueID,$literalApplicationID));