diff -r 5b37998e522e -r 162c1de6545a web/lib/Zend/Service/Amazon/Query.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/lib/Zend/Service/Amazon/Query.php	Fri Mar 11 15:05:35 2011 +0100
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Amazon
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+
+/**
+ * @see Zend_Service_Amazon
+ */
+require_once 'Zend/Service/Amazon.php';
+
+
+/**
+ * @category   Zend
+ * @package    Zend_Service
+ * @subpackage Amazon
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Service_Amazon_Query extends Zend_Service_Amazon
+{
+    /**
+     * Search parameters
+     *
+     * @var array
+     */
+    protected $_search = array();
+
+    /**
+     * Search index
+     *
+     * @var string
+     */
+    protected $_searchIndex = null;
+
+    /**
+     * Prepares query parameters
+     *
+     * @param  string $method
+     * @param  array  $args
+     * @throws Zend_Service_Exception
+     * @return Zend_Service_Amazon_Query Provides a fluent interface
+     */
+    public function __call($method, $args)
+    {
+        if (strtolower($method) === 'asin') {
+            $this->_searchIndex = 'asin';
+            $this->_search['ItemId'] = $args[0];
+            return $this;
+        }
+
+        if (strtolower($method) === 'category') {
+            $this->_searchIndex = $args[0];
+            $this->_search['SearchIndex'] = $args[0];
+        } else if (isset($this->_search['SearchIndex']) || $this->_searchIndex !== null || $this->_searchIndex === 'asin') {
+            $this->_search[$method] = $args[0];
+        } else {
+            /**
+             * @see Zend_Service_Exception
+             */
+            require_once 'Zend/Service/Exception.php';
+            throw new Zend_Service_Exception('You must set a category before setting the search parameters');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Search using the prepared query
+     *
+     * @return Zend_Service_Amazon_Item|Zend_Service_Amazon_ResultSet
+     */
+    public function search()
+    {
+        if ($this->_searchIndex === 'asin') {
+            return $this->itemLookup($this->_search['ItemId'], $this->_search);
+        }
+        return $this->itemSearch($this->_search);
+    }
+}