Changeset 310 for Dev/branches/jos-branch/server/api.php

Timestamp:

03/09/12 16:03:03 (13 years ago)

Author:

jkraaijeveld

Message:

Merged rest-dojo-ui 305:309

Location:

Dev/branches/jos-branch/server

Files:

• . (modified) (1 prop)
• api.php (modified) (4 diffs)

Dev/branches/jos-branch/server/api.php

@@ -4 +4 @@
 ini_set('display_errors', True);
 
+define("RDFAPI_INCLUDE_DIR", "rdfapi/");
 require_once 'tonic/lib/tonic.php';
+require_once 'classes/Model.php';
 require_once 'classes/master.php';
 
@@ -13 +15 @@
 
 function set_session_cookie($response, $user) {
-    $response->addHeader('Set-Cookie', 'rft_uid=' . $user->uid . '; Max-Age: 3600; Path=' . $response->request->baseUri);
+    $response->addHeader('Set-Cookie', 'rft_uid=' . $user->getUid() . '; Max-Age: 3600; Path=' . $response->request->baseUri);
 }
 
@@ -87 +89 @@
 class DataCollectionResource extends Resource {
 
-    function getType($request) {
+    private function getTypeAndUid($request) {
         $uri = get_clean_uri($request);
         $path = explode('/', $uri);
@@ -202 +204 @@
             $object->$key = $val;
         }
-        if (!$object->save()) {
-            throw new ResponseException("Save failed", Response::INTERNALSERVERERROR);
-        }
+        $object->save();
 
         $response->body = $object;