Make Store conform to the IContentStore interface.

platform/store.php

@@ -365,6 +365,7 @@ public function __construct($model, $args)
 			$this->storableClass = $args['storableClass'];
 		}		
 		$this->total = $this->rs->total;
+		$this->count = count($this->rs);
 		if(isset($args['offset'])) $this->offset = $args['offset'];
 		if(isset($args['limit'])) $this->limit = $args['limit'];
 		$this->rewind();
@@ -377,7 +378,6 @@ protected function updateCurrent()
 		{
 			if($this->data['uuid'] != $this->key)
 			{
-				$this->count++;
 				$this->key = $this->data['uuid'];
 				if(!isset($this->data['data']))
 				{
@@ -423,14 +423,13 @@ public function next()
 
 	public function rewind()
 	{	
-		$this->count = 0;		
 		$this->rs->rewind();
 		$this->updateCurrent();
 	}
 
 	public function count()
 	{
-		return $this->count;
+		return count($this->rs);
 	}
 }
 
@@ -458,6 +457,8 @@ class Store extends Model implements IContentStore
 	 */
 	protected $queriesGroupByUuid = true;
 
+	protected $insertedUuid = null;
+
 	public static function getInstance($args = null)
 	{
 		if(!isset($args['class'])) $args['class'] = 'Store';
@@ -766,6 +767,31 @@ public function objectForIri($iri, $owner = null, $kind = null, $firstOnly = fal
 		return call_user_func(array($this->storableClass, 'objectForData'), $data, $this, $this->storableClass);
 	}
 
+	public function /* IContentStore::*/insert($data)
+	{
+		return $this->setData($data);
+	}
+
+	public function /* IContentStore::*/update($what, $data)
+	{
+		$data['uuid'] = $what;
+		return $this->setData($data);
+	}
+
+	public function /* IContentStore::*/insertId()
+	{
+		return $this->insertedUuid;
+	}
+
+	public function /* IContentStore::*/fetch($what)
+	{
+		return $this->objectForUuid($what);
+	}
+
+	public function /* IContentStore::*/delete($what)
+	{
+	}
+
 	/* Store an object, which may be in associative array or instance form,
 	 * or may be an (indexed) array of the same. In the latter case, the
 	 * keys MUST begin at zero.
@@ -801,6 +827,7 @@ public function setData($data, $user = null, $lazy = false, $owner = null)
 		{
 			$uuid = UUID::generate();
 		}
+		$this->insertedUuid = $uuid;
 		$user_scheme = $user_uuid = null;
 		$uuid = strtolower($uuid);
 		if(isset($user))
@@ -1072,6 +1099,10 @@ public function query($query)
 				$qstr .= ' LIMIT ' . $limit;
 			}
 		}
+		if(defined('EREGANSU_DEBUG_STORE_QUERY'))
+		{
+			error_log($qstr);
+		}
 		if(($rs = $this->db->query($qstr)))
 		{
 			$query['recordSet'] = $rs;