From 85292715debb0a5fda0877a903018b9778aaa8c4 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Tue, 13 Mar 2012 14:47:43 +0100
Subject: [PATCH 1/2] fix appbox::get_instance issue

---
 lib/classes/module/console/fieldsList.class.php               | 2 +-
 lib/classes/module/console/sphinxGenerateSuggestion.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/classes/module/console/fieldsList.class.php b/lib/classes/module/console/fieldsList.class.php
index ad9bb497d8..b1a5e14be5 100644
--- a/lib/classes/module/console/fieldsList.class.php
+++ b/lib/classes/module/console/fieldsList.class.php
@@ -37,7 +37,7 @@ class module_console_fieldsList extends Command
   public function execute(InputInterface $input, OutputInterface $output)
   {
 
-    $appbox = \appbox::get_instance();
+    $appbox = \appbox::get_instance(\bootstrap::getCore());
 
     foreach ($appbox->get_databoxes() as $databox)
     {
diff --git a/lib/classes/module/console/sphinxGenerateSuggestion.class.php b/lib/classes/module/console/sphinxGenerateSuggestion.class.php
index 5aec86995a..ba9f4dbf72 100644
--- a/lib/classes/module/console/sphinxGenerateSuggestion.class.php
+++ b/lib/classes/module/console/sphinxGenerateSuggestion.class.php
@@ -40,7 +40,7 @@ class module_console_sphinxGenerateSuggestion extends Command
     define('FREQ_THRESHOLD', 10);
     define('SUGGEST_DEBUG', 0);
 
-    $appbox = \appbox::get_instance();
+    $appbox = \appbox::get_instance(\bootstrap::getCore());
     $registry = $appbox->get_registry();
 
     $params = phrasea::sbas_params();

From aace1a08478078cdec0c92fcf3e5dc838cece3f3 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Tue, 13 Mar 2012 14:58:08 +0100
Subject: [PATCH 2/2] add check for binary

---
 .../console/sphinxGenerateSuggestion.class.php     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/classes/module/console/sphinxGenerateSuggestion.class.php b/lib/classes/module/console/sphinxGenerateSuggestion.class.php
index ba9f4dbf72..42d504a437 100644
--- a/lib/classes/module/console/sphinxGenerateSuggestion.class.php
+++ b/lib/classes/module/console/sphinxGenerateSuggestion.class.php
@@ -60,7 +60,19 @@ class module_console_sphinxGenerateSuggestion extends Command
       $databox = databox::get_instance($sbas_id);
 
       $output->writeln("process Databox " . $databox->get_viewname() . " / $index\n");
-
+      
+      if(!is_executable("/usr/local/bin/indexer"))
+      {
+        $output->writeln("<error>'/usr/local/bin/indexer' is not executable</error>");
+        return 1;
+      }
+      
+      if(!file_exists($tmp_file))
+      {
+        $output->writeln("<error> file '".$tmp_file."' does not exist</error>");
+        return 1;
+      }
+      
       $cmd = '/usr/local/bin/indexer metadatas' . $index . '  --buildstops ' . $tmp_file . ' 1000000 --buildfreqs';
       exec($cmd);