Changeset 303 for Dev/branches/rest-dojo-ui/server/classes/Marshaller.php

Timestamp:

03/04/12 15:48:42 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[Server] Refactored model classes with some meta-programming. Specific classes only define their fields and inherit from class RdfObject?. Changes to handle the new model objects correctly.
[Client] Added rft/store module for uniform resource access. Removed dependencies on 'uid' field name. Added support for references without loading full object nor exposing uri.
[Client] Added reset() to QuestionWidget?.
[RDFAPI] Fixed PHP warning.

File:

• Dev/branches/rest-dojo-ui/server/classes/Marshaller.php (modified) (6 diffs)

Dev/branches/rest-dojo-ui/server/classes/Marshaller.php

@@ -4 +4 @@
 
     const OBJ_TYPE = '__objectType';
+    const OBJ_UID = '__objectUid';
+    const REF_TYPE = '__referenceType';
+    const REF_UID = '__referenceUid';
 
     private static function isWrappedObject($obj) {
@@ -9 +12 @@
     }
 
+    private static function isWrappedReference($obj) {
+        return isset($obj[self::REF_TYPE]);
+    }
+
     public static function marshall($obj) {
         switch (gettype($obj)) {
             case 'array':
-                return array_map(array('Marshaller','marshall'), $obj);
+                return array_map(array('Marshaller', 'marshall'), $obj);
             case 'object':
                 return static::wrapObject($obj);
@@ -24 +31 @@
         if ($objectType == 'DateTime') {
             return array(self::OBJ_TYPE => 'DateTime', 'timestamp' => $obj->getTimestamp());
+        } else if ($obj instanceof RdfObject) {
+            $array = array(
+                self::OBJ_TYPE => $obj->getType(),
+                self::OBJ_UID => $obj->getUid()
+            );
+            foreach ($obj as $prop => $val) {
+                $array[$prop] = static::marshall($val);
+            }
+            return $array;
+        } else if ($obj instanceof RdfPointer) {
+            return array(
+                self::REF_TYPE => $obj->getType(),
+                self::REF_UID => $obj->getUid()
+            );
         } else {
-            $newObj = static::marshall((array) $obj);
-            $newObj[self::OBJ_TYPE] = get_class($obj);
-            return $newObj;
+            return static::marshall((array) $obj);
         }
     }
@@ -38 +57 @@
                 if (static::isWrappedObject($obj)) {
                     return static::unwrapObject($obj);
+                } else if (static::isWrappedReference($obj)) {
+                    return static::unwrapReference($obj);
                 } else {
-                    return array_map(array('Marshaller','unmarshall'), $obj);
+                    return array_map(array('Marshaller', 'unmarshall'), $obj);
                 }
             default:
@@ -47 +68 @@
 
     private static function unwrapObject($obj) {
-        $objectType = $obj[self::OBJ_TYPE];
-        unset($obj[self::OBJ_TYPE]);
+        if (isset($obj[self::OBJ_TYPE])) {
+            $objectType = $obj[self::OBJ_TYPE];
+            unset($obj[self::OBJ_TYPE]);
+        }
+        if (isset($obj[self::OBJ_UID])) {
+            $objectUid = $obj[self::OBJ_UID];
+            unset($obj[self::OBJ_UID]);
+        }
         if ($objectType == 'DateTime') {
             $date = new DateTime();
             $date->setTimestamp($obj['timestamp']);
             return $date;
-        } else if (is_subclass_of($objectType, 'ResearchToolObjectInterface')) {
-            return $objectType::create((object)static::unmarshall($obj));
+        } else if (is_subclass_of($objectType, 'RdfObject')) {
+            $rdfObject = new $objectType($objectUid);
+            foreach ($obj as $prop => $val) {
+                $rdfObject->$prop = static::unmarshall($val);
+            }
+            return $rdfObject;
         } else {
             return $obj;
@@ -60 +91 @@
     }
 
+    private static function unwrapReference($ref) {
+        $refType = $ref[self::REF_TYPE];
+        $refUid = $ref[self::REF_UID];
+        return new RdfPointer(RdfObject::typeAndUidToResourceUri($refType, $refUid));
+    }
+    
 }