2 files changed, 62 insertions, 15 deletions

diff --git a/modules/gallery/helpers/item_rest.php b/modules/gallery/helpers/item_rest.php
index 36d2ca62..298c2f4a 100644
--- a/modules/gallery/helpers/item_rest.php
+++ b/modules/gallery/helpers/item_rest.php
@@ -126,18 +126,19 @@ class item_rest_Core {
         }
       }
     }
+    $item->save();
 
-    $weight = 0;
     if (isset($request->params->members)) {
+      $weight = 0;
       foreach ($request->params->members as $url) {
         $child = rest::resolve($url);
         if ($child->parent_id == $item->id && $child->weight != $weight) {
-          $child->weight = $weight++;
+          $child->weight = $weight;
           $child->save();
         }
+        $weight++;
       }
     }
-    $item->save();
   }
 
   static function post($request) {
diff --git a/modules/gallery/helpers/items_rest.php b/modules/gallery/helpers/items_rest.php
index 5d8e80b2..32597a65 100644
--- a/modules/gallery/helpers/items_rest.php
+++ b/modules/gallery/helpers/items_rest.php
@@ -18,28 +18,74 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class items_rest_Core {
+  /**
+   * To retrieve a collection of items, you can specify the following query parameters to specify
+   * the type of the collection.  If both are specified, then the url parameter is used and the
+   * ancestor_for is ignored.  Specifying the "type" parameter with the urls parameter, will
+   * filter the results based on the specified type.  Using the type parameter with the
+   * ancestor_for parameter makes no sense and will be ignored.
+   *
+   *   urls=url1,url2,url3
+   *     return items that match the specified urls.  Typically used to return the member detail
+   *
+   *   ancestor_for=url
+   *     return the ancestors of the specified item
+   *
+   *   type=<comma separate list of photo, movie or album>
+   *     limit the type to types in this list.  eg, "type=photo,movie"
+   */
   static function get($request) {
-
     $items = array();
-    if (isset($request->params->url)) {
-      foreach (json_decode($request->params->url) as $url) {
+    if (isset($request->params->urls)) {
+      foreach (json_decode($request->params->urls) as $url) {
+        if (isset($request->params->type)) {
+          $types = explode(",", $request->params->type);
+        }
         $item = rest::resolve($url);
         if (access::can("view", $item)) {
-          $item_rest = array("url" => $url,
-                             "entity" => $item->as_restful_array(),
-                             "relationship" => rest::relationships("item", $item));
-          if ($item->type == "album") {
-            $members = array();
-            foreach ($item->children() as $child) {
-              $members[] = rest::url("item", $child);
+          if (isset($types)) {
+            if (in_array($item->type, $types)) {
+              $items[] = items_rest::format_restful_item($item);
             }
-            $item_rest["members"] = $members;
+          } else {
+            $items[] = items_rest::format_restful_item($item);
           }
-          $items[] = $item_rest;
         }
       }
+    } else if (isset($request->params->ancestor_for)) {
+      $item = rest::resolve($request->params->ancestor_for);
+      if (!access::can("view", $item)) {
+        throw new Kohana_404_Exception();
+      }
+      $items[] = items_rest::format_restful_item($item);
+      while (($item = $item->parent()) != null) {
+        array_unshift($items, items_rest::format_restful_item($item));
+      };
     }
 
     return $items;
   }
+
+  static function resolve($id) {
+    $item = ORM::factory("item", $id);
+    if (!access::can("view", $item)) {
+      throw new Kohana_404_Exception();
+    }
+    return $item;
+  }
+
+  private static function format_restful_item($item) {
+    $item_rest = array("url" => rest::url("item", $item),
+                       "entity" => $item->as_restful_array(),
+                       "relationships" => rest::relationships("item", $item));
+    if ($item->type == "album") {
+      $members = array();
+      foreach ($item->children() as $child) {
+        $members[] = rest::url("item", $child);
+      }
+      $item_rest["members"] = $members;
+    }
+
+    return $item_rest;
+  }
 }