Changeset 289 for Dev/branches/rest-dojo-ui/server/classes/models/ResearchToolObject.php

Timestamp:

02/24/12 16:17:56 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[merge] svn merge ../jos-branch -r 284:287 .

Location:

Dev/branches/rest-dojo-ui

Files:

• . (modified) (1 prop)
• server/classes/models/ResearchToolObject.php (modified) (2 diffs)

Dev/branches/rest-dojo-ui/server/classes/models/ResearchToolObject.php

@@ -30 +30 @@
                         $model->load($filename);
                 return $model;
+        }
+
+        /**
+         * function stripUri($inString)
+         * @param type $inString
+         * Takes a URI and creates a new array which contains the type and the uid of the object
+         */
+        public static function stripUri($inString)
+        {
+                $exp = explode('/', $inString);
+                if(sizeof($exp) < 7)
+                        return null;
+                else
+                        return array("type" => $exp[5], "uid" => $exp[6]);
         }
 
@@ -67 +81 @@
                                 case "answersets" : foreach($arguments[$key] as $answerset) { $addition = $addition . "predicates:has_answerset '" . $answerset . "'\n"; } break;
                                 case "questions" : foreach($arguments[$key] as $question) { $addition = $addition . "predicates:has_question '" . $question . "'\n"; } break;
-                                case "location" : $addition = "predicates:location '" . $arguments[$key] . "\n"; break;
-                                case "facilitator" : $addition = "predicates:facilitator '" . $arguments[$key] . "\n"; break;
-                                case "starttime" : $addition = "predicates:starttime '" . $arguments[$key] . "\n"; break;
-                                case "endtime" : $addition = "predicates:endtime '" . $arguments[$key] . "\n"; break;
-                                case "session" : $addition = "predicates:of_session '" . $arguments[$key] . "\n"; break;
-                                case "resultset" : $addition = "predicates:has_resultset '" . $arguments[$key] . "\n"; break;
-                                case "of_application" : $addition = "predicates:of_application '" . $arguments[$key] . "\n"; break;
+                                case "location" : $addition = "predicates:location '" . $arguments[$key] . "'\n"; break;
+                                case "facilitator" : $addition = "predicates:facilitator '" . $arguments[$key] . "'\n"; break;
+                                case "starttime" : $addition = "predicates:starttime '" . $arguments[$key] . "'\n"; break;
+                                case "endtime" : $addition = "predicates:endtime '" . $arguments[$key] . "'\n"; break;
+                                case "session" : $addition = "predicates:of_session '" . $arguments[$key] . "'\n"; break;
+                                case "resultset" : $addition = "predicates:has_resultset '" . $arguments[$key] . "'\n"; break;
+                                case "of_application" : $addition = "predicates:of_application <" . APPLICATION . '/' .  $arguments[$key] . ">\n"; break;
                                 case "open" : $addition = "predicates:open '" . $arguments[$key] . "\n"; break;
                         }