Changeset 144 for Dev/trunk/classes

Timestamp:

11/03/11 10:30:40 (13 years ago)

Author:

fpvanagthoven

Message:

Fixed mkdir call in ApplicationConnector?.php, now actually makes a directory instead of errors.
Cleaning up of pipeline Sequencer, smaller icons, etc. Trying to get non-db version of editor working properly, then integrate db calls.

Location:

Dev/trunk/classes

Files:

• ApplicationConnector.php (modified) (8 diffs)
• DisplayStep.php (modified) (2 diffs)
• Step.php (added)
• Toolbox.php (added)
• pipelineSequencer.php (added)

Dev/trunk/classes/ApplicationConnector.php

@@ -11 +11 @@
  * @author jkraaijeveld
  */
-class ApplicationConnector implements IConnector{
-    
+class ApplicationConnector implements IConnector {
+
     protected $model;
     protected $fileName = 'data/applications/applications.rdf';
@@ -19 +19 @@
      * Constructor for ApplicationConnector.
      */
-    public function __construct()
-    {
+    public function __construct() {
         //Ensure the required folder for this connector exists
-        if (!is_dir('data/applications/'))
-            mkdir('data/applications/');        
+        if (!is_dir('data/applications/')) {
+            mkdir('data/applications/', null, true);
+        }
     }
-    
+
     /**
      * function load()
@@ -33 +33 @@
         //Get the Memory Model from the ModelFactory
         $this->model = ModelFactory::getDefaultModel();
-        
+
         //Ensure the required file exists before loading
-        if(file_exists($this->fileName))
+        if (file_exists($this->fileName))
             $this->model->load($this->fileName);
     }
-    
+
     /**
      * function save()
@@ -44 +44 @@
      */
     public function save() {
-        $this->model->saveAs($this->fileName,'rdf'); 
+        $this->model->saveAs($this->fileName, 'rdf');
     }
-    
+
     /**
      * function get($arguments)
@@ -58 +58 @@
         $keys = array_keys($arguments);
         //Set default values for arguments
-        $uid = "?uid"; $title = "?title"; $description = "?description"; $style = "?style";
+        $uid = "?uid";
+        $title = "?title";
+        $description = "?description";
+        $style = "?style";
         //Set the arguments if they are supplied
-        if(in_array("uid", $keys))
-            $uid = "\"".$arguments["uid"]."\"";
-        if(in_array("title", $keys))
-            $title = '\''.$arguments["title"].'\'';
-        if(in_array("description", $keys))
-            $description = "\"".$arguments["description"]."\"";
-        if(in_array("style", $keys))
-            $style = "\"".$arguments["style"]."\"";    
+        if (in_array("uid", $keys))
+            $uid = "\"" . $arguments["uid"] . "\"";
+        if (in_array("title", $keys))
+            $title = '\'' . $arguments["title"] . '\'';
+        if (in_array("description", $keys))
+            $description = "\"" . $arguments["description"] . "\"";
+        if (in_array("style", $keys))
+            $style = "\"" . $arguments["style"] . "\"";
 
         //Create the querystring 
@@ -90 +93 @@
         $results = $this->model->sparqlQuery($querystring);
         $applications = array();
-        if(!empty($results))
-        {
+        if (!empty($results)) {
             //Run over all results and create appropriate Application objets
-            foreach($results as $result)
-            { 
-                    $applications[] = new Application($result['?uid']->label, $result['?title']->label, $result['?description']->label, $result['?style']->label);
+            foreach ($results as $result) {
+                $applications[] = new Application($result['?uid']->label, $result['?title']->label, $result['?description']->label, $result['?style']->label);
             }
         }
         return $applications;
     }
-    
+
     /**
      * function set()
@@ -107 +108 @@
      * @param type $rToolObject: The ResearchToolObject to be saved. 
      */
-    public function set($rToolObject)
-    {
+    public function set($rToolObject) {
         $this->load();
-        $resourceApplication = new Resource(APPLICATION.'/'.$rToolObject->uid);
+        $resourceApplication = new Resource(APPLICATION . '/' . $rToolObject->uid);
         //Remove the old value stored with the given id
         $this->model->subtract($this->model->find($resourceApplication, null, null));
@@ -117 +117 @@
         $resourceApplicationType = new Resource(APPLICATION);
         $predicateRType = new Resource(RTYPE);
-        $this->model->add(new Statement($resourceApplication,$predicateRType,$resourceApplicationType));
-                
+        $this->model->add(new Statement($resourceApplication, $predicateRType, $resourceApplicationType));
+
         $literalApplicationID = new Literal($rToolObject->uid);
         $predicateUniqueID = new Resource(UID);
-        $this->model->add(new Statement($resourceApplication,$predicateUniqueID,$literalApplicationID));
+        $this->model->add(new Statement($resourceApplication, $predicateUniqueID, $literalApplicationID));
 
         $applicationTitle = new Literal($rToolObject->title);
-        $predicateTitle = new Resource(TITLE);  
-        $this->model->add(new Statement($resourceApplication,$predicateTitle,$applicationTitle));
+        $predicateTitle = new Resource(TITLE);
+        $this->model->add(new Statement($resourceApplication, $predicateTitle, $applicationTitle));
 
         $applicationDescription = new Literal($rToolObject->description);
         $predicateDescription = new Resource(DESCRIPTION);
-        $this->model->add(new Statement($resourceApplication,$predicateDescription,$applicationDescription));
+        $this->model->add(new Statement($resourceApplication, $predicateDescription, $applicationDescription));
 
         $applicationStyle = new Literal($rToolObject->style);
         $predicateStyle = new Resource(STYLE);
-        $this->model->add(new Statement($resourceApplication,$predicateStyle,$applicationStyle));
-                
-        $this->save();
+        $this->model->add(new Statement($resourceApplication, $predicateStyle, $applicationStyle));
+
+        $this->save();
     }
+
 }
 

Dev/trunk/classes/DisplayStep.php

@@ -18 +18 @@
     public $imageURL;
     public $selected = false;
-    public $name;
+    public $caption;
+    public $id;
 
-    public function __construct($t, $ref=null, $n) {
-        
+    public function __construct($t, $ref=null, $c, $id) {
+
         $this->type = $t;
         $this->reference = $ref;
-        $this->name = $n;
-        
+        $this->caption = $c;
+        $this->id = $id;
+
         switch ($this->type) {
             case "Questionnaire":
-                $this->imageURL = "images/icons/questionnaire2.png";
+                $this->imageURL = "images/icons/questionnaire.png";
                 break;
             case "Dashboard":
-                $this->imageURL = "images/icons/dashboard2.png";
+                $this->imageURL = "images/icons/dashboard.png";
                 break;
             case "Application":
-                $this->imageURL = "images/icons/application2.png";
-                break;
-            case "Notice":
-                $this->imageURL = "images/icons/notice2.png";
+                $this->imageURL = "images/icons/application.png";
                 break;
             default:
@@ -43 +42 @@
                 break;
         }
-        
+
         //output a display object
-        echo '<div class="displayStep" style="background-image: url(\'';
-        echo $this->imageURL;
-        echo '\');" ><p>'.$this->name.'</p></div>'."\n";
-        
+        //echo '<div class="displayStep"><div class="displayStepIcon" style="background-image: url('.$this->imageURL.');"></div>'.$this->caption.'</div>'."\n";
+        echo '<div class="displayStep"><div class="displayStepIcon"><img src="' . $this->imageURL . '" /></div>' . $this->caption . '</div>';
     }