From 4130e5db36c115c722a7d55bd00b43f7a51b4a6d Mon Sep 17 00:00:00 2001
From: Julian Garcia Castillo <squeleton@gmail.com>
Date: Mon, 20 Feb 2017 20:41:14 +0100
Subject: [PATCH] fixes and improvements

---
 Controller/api/getStoriesLength.php |  6 +++---
 Controller/api/getStory.php         | 27 ++++++++++++++++++---------
 Controller/procesaHistoria.php      |  2 +-
 Model/Historia.php                  |  9 +++------
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/Controller/api/getStoriesLength.php b/Controller/api/getStoriesLength.php
index f615a4e..3f1ee94 100644
--- a/Controller/api/getStoriesLength.php
+++ b/Controller/api/getStoriesLength.php
@@ -2,10 +2,10 @@
 /*
  * Get stories collection length
  */
-require_once '../Model/Historia.php';
-require_once '../Controller/sesionCheck.php';
+require_once '../../Model/Historia.php';
 
 $collectionLength = Historia::storiesLength();
-return json_encode($collectionLength);
+
+echo json_encode($collectionLength);
 
 
diff --git a/Controller/api/getStory.php b/Controller/api/getStory.php
index 69c56bf..662ff67 100644
--- a/Controller/api/getStory.php
+++ b/Controller/api/getStory.php
@@ -2,11 +2,9 @@
 /*
  * Procesa los datos recibidos de estructura.js a traves de ajax y crea la historia con las caracteristicas elegidas por el user.
  */
-require_once '../Model/Historia.php';
-require_once '../Model/Personaje.php';
-require_once '../Model/Lugar.php';
-require_once '../Model/Usuario.php';
-require_once '../Controller/sesionCheck.php';
+require_once '../../Model/Historia.php';
+require_once '../../Model/Personaje.php';
+require_once '../../Model/Lugar.php';
 
 /* 
 PARAMETERS RECEIVED
@@ -69,12 +67,23 @@
 }
 
 // Get random story from DB
-do {
+if ($readStories) {
+  do {
+    $rndStory = Historia::random($lang);
+  } while (!_isStoryUnique($rndStory->id));
+} else {
   $rndStory = Historia::random($lang);
-} while (!_isStoryUnique($rndStory->id));
+}
+
 // Get specific language
-$langTitle = "titulo-".$lang;
-$langStory = "contenido-".$lang;
+if ($lang == "es") {
+  $langTitle = titulo_es;
+  $langStory = contenido_es;
+} else {
+  $langTitle = titulo_en;
+  $langStory = contenido_en;
+}
+
 $historia = new Historia($rndStory->id, $rndStory->$langTitle, $rndStory->$langStory, $rndStory->autor, $rndStory->fecha);
 
 // Aumentar numero de Cuentos leidos por ese user
diff --git a/Controller/procesaHistoria.php b/Controller/procesaHistoria.php
index e1fb516..d9e9185 100644
--- a/Controller/procesaHistoria.php
+++ b/Controller/procesaHistoria.php
@@ -42,7 +42,7 @@
         }
 // Selecciona historia random de DB
 $historiaRnd = Historia::random();
-$historia = new Historia($historiaRnd->id, $historiaRnd->titulo, $historiaRnd->contenido, $historiaRnd->autor, $historiaRnd->fecha);
+$historia = new Historia($historiaRnd->id, $historiaRnd->titulo_es, $historiaRnd->contenido_es, $historiaRnd->autor, $historiaRnd->fecha);
 
 // Aumentar numero de Cuentos leidos por ese user
 $usuario = new Usuario($usuarioSes,"","","","","");
diff --git a/Model/Historia.php b/Model/Historia.php
index 3d43529..c306096 100644
--- a/Model/Historia.php
+++ b/Model/Historia.php
@@ -107,17 +107,14 @@ public function toJSON(){
         return json_encode($out);
     }
     // Devuelve un cuento random.
-    public static function random($language){
-        if (!$language) {
-            $language = "es";
-        }
+    public static function random(){
         $conexion = StorianDB::connectDB();
         $query = $conexion->query("SELECT * FROM cuento ORDER BY RAND() LIMIT 1");
         return $tabla = $query->fetchObject();
     }
 
-    // It returns collection length from specific language
-    public function storiesLength($language) {
+    // It returns collection length
+    public static function storiesLength() {
         $conexion = StorianDB::connectDB();
         $query = $conexion->query("SELECT * FROM `cuento`");
         return $query->rowCount();