Bug SAFeSEA#31, fixes to utils/CliApp, EssayAnalyser [iet:10299536]

IET-OU · Feb 3, 2018 · b5403c4 · b5403c4
1 parent ed60d33
commit b5403c4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/app/cli.php b/app/cli.php
@@ -43,7 +43,7 @@
 
   $result = oeApp::createDatabase();
 
-  Clio::output('>> OK. Database created: '. $database);
+  Clio::output('>> OK. Database created: '. $result->database);
   print_r( $result );
   exit;
 }
@@ -56,7 +56,7 @@
     Clio::error('Database Error: ' . $ex->getMessage()); // Table exists ??
     exit( 1 );
   }
-  Clio::output('>> OK. Tables created. Schema: ' . oeApp::SCHEMA_FILE);
+  Clio::output("\n" . '>> OK. Tables created. Schema: ' . oeApp::SCHEMA_FILE);
 
   print_r( $result );
   exit;

diff --git a/app/controllers/user.controller.php b/app/controllers/user.controller.php
@@ -287,7 +287,7 @@ public function submitDraft($taskId)
 				$versionId = $formdata["version"] = $post["version"];
 
 				$analyser = new IET_OU\OpenEssayist\Utils\EssayAnalyser();
-				$result = $analyser->setup();
+				$result = $analyser->initResult();
 
 				try {
 					$result = $analyser->analyseAndSave( $taskId, $this->user[ 'id' ] );

diff --git a/app/utils/CliApp.php b/app/utils/CliApp.php
@@ -48,7 +48,11 @@ public static function createDatabase()
     $result = $dbh->exec("CREATE DATABASE IF NOT EXISTS `$database`;")
   	or die(print_r($dbh->errorInfo(), true));
 
-    return $result;
+    return (object) [
+      'result' => $result,
+      'database' => $database,
+      'dbh' => $dbh,
+    ];
   }
 
   /**

diff --git a/app/utils/EssayAnalyser.php b/app/utils/EssayAnalyser.php
@@ -10,7 +10,10 @@
 
 class EssayAnalyser extends \Application
 {
-  public function setup()
+  /**
+   * @return object  Return an initialized 'result' object.
+   */
+  public function initResult()
   {
     return (object) [
       'status' => 200,
@@ -25,15 +28,15 @@ public function setup()
    *
    * @param int $taskId
    * @param int $userId
-   * @return object  A result object.
+   * @return object  A 'result' object.
    */
   public function analyseAndSave( $taskId, $userId )
   {
     $req = $this->app->request();
     $log = $this->app->getLog();
     $post = $req->post();
 
-    $result = $this->setup();
+    $result = $this->initResult();
 
     $url = $this->getAnalyserUrl('/api/analysis');