Update queries

tripal · Aug 25, 2017 · c21d97e · c21d97e
1 parent 33859d9
commit c21d97e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/CLIPrompt.php b/src/CLIPrompt.php
@@ -47,8 +47,10 @@ public function ask($question, $style = NULL) {
       $question = $this->applyStyle($question, $style);
     }
 
-    while (empty($response = readline($question))) {
+   echo $question;
+    while (empty($response = readline())) {
       $this->error('Please provide a response');
+      echo $question;
     }
 
     return $response;

diff --git a/src/Colors.php b/src/Colors.php
@@ -60,7 +60,7 @@ public function __construct() {
   public function str($string, $foreground_color = NULL, $background_color = NULL) {
     $colored_string = '';
     $colored_padding = '';
-    $string = ' ' . $string . ' ';
+    //$string = ' ' . $string . ' ';
     $padding = str_pad('', strlen($string), ' ');;
 
     // Check if given foreground color found
@@ -77,9 +77,9 @@ public function str($string, $foreground_color = NULL, $background_color = NULL)
       // Add string and end coloring
       $colored_string .= $string . "\033[0m";
 
-      $full_string = '  ' . $colored_padding . PHP_EOL;
-      $full_string .= '  ' . $colored_string . PHP_EOL;
-      $full_string .= '  ' . $colored_padding;
+      //$full_string = $colored_padding . PHP_EOL;
+      $full_string =  $colored_string;// . PHP_EOL;
+      //$full_string .=  $colored_padding;
     }
     else {
       $full_string = $colored_string;

diff --git a/src/Generator.php b/src/Generator.php
@@ -217,7 +217,7 @@ protected function validateTerms() {
     }
 
     if (!$failed) {
-      $results = $this->db->query('SELECT CV.name AS cv_name, DB.name AS db_name, DBXREF.accession AS accession
+      $results = $this->db->query('SELECT CV.name AS cv_name, DB.name AS db_name, DBX.accession AS accession
                         FROM chado.cvterm AS CVTERM
                         JOIN  chado.cv AS CV ON CVTERM.cv_id  = CV.cv_id
                         JOIN  chado.dbxref AS DBX ON CVTERM.dbxref_id = DBX.dbxref_id