Fix issues with simfile controller.

diff --git a/Controllers/SimfileController.php b/Controllers/SimfileController.php
index 84bdfdf..b56cb4a 100644 (file)
--- a/Controllers/SimfileController.php
+++ b/Controllers/SimfileController.php
@@ -40,7 +40,10 @@ class SimfileController implements IDivineController
         \r
         foreach($simfiles as $simfile)\r
         {\r
-            $returnArray[$simfile->getTitle()] = array('artist' => $simfile->getArtist()->getName());\r
+            $returnArray[] = array(\r
+                'artist' => $simfile->getArtist()->getName(),\r
+                'title' => $simfile->getTitle()\r
+            );\r
         }\r
         \r
         $this->_response->setHeader('Content-Type', 'application/json')\r

diff --git a/DataAccess/StepMania/SimfileRepository.php b/DataAccess/StepMania/SimfileRepository.php
index 87e6eaf..a4a1f16 100644 (file)
--- a/DataAccess/StepMania/SimfileRepository.php
+++ b/DataAccess/StepMania/SimfileRepository.php
@@ -21,18 +21,18 @@ class SimfileRepository implements ISimfileRepository
     }\r
     \r
     public function findById($id) {\r
-        return $this->_dataMapper->map(\r
-            'Simfile',\r
-            'SELECT * FROM %s WHERE id=' . $id\r
-        );\r
+        $queryBuilder = $this->_queryBuilderFactory->createInstance();\r
+        $queryBuilder->where('id', '=', $id);\r
+                \r
+        return $this->_dataMapper->map('Simfile', $queryBuilder);\r
     }\r
     \r
     public function findRange($id, $limit)\r
     {\r
-        return $this->_dataMapper->findRange(\r
-            'Simfile',\r
-            'SELECT * FROM %s WHERE id>=' . $id . ' LIMIT ' . $limit\r
-        );\r
+        $queryBuilder = $this->_queryBuilderFactory->createInstance();\r
+        $queryBuilder->where('id', '>=', $id)->limit($limit);\r
+                \r
+        return $this->_dataMapper->map('Simfile', $queryBuilder);\r
     }\r
     \r
     public function save(ISimfile $entity) {\r