diff --git a/config/application.config.php b/config/application.config.php
index 183a9ebc3330eec5c9aa58ab531a85d6bfde3811..03ad5f13e447b85383c761c30c0a8af04919ea2f 100644
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -21,6 +21,6 @@ $config = array(
),
);
if (PHP_SAPI == 'cli' && !defined('VUFIND_PHPUNIT_RUNNING')) {
- $config['modules'][] = 'VuFind\\CLI';
+ $config['modules'][] = 'VuFindConsole';
}
return $config;
\ No newline at end of file
diff --git a/module/VuFind/CLI/config/module.config.php b/module/VuFind/CLI/config/module.config.php
deleted file mode 100644
index acbcbe2c41c2e540021ae922d715413d7d69ee3a..0000000000000000000000000000000000000000
--- a/module/VuFind/CLI/config/module.config.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace VuFind\CLI\Module\Configuration;
-
-$config = array(
- 'controllers' => array(
- 'invokables' => array(
- 'harvest' => 'VuFind\CLI\Controller\HarvestController',
- 'import' => 'VuFind\CLI\Controller\ImportController',
- 'util' => 'VuFind\CLI\Controller\UtilController',
- ),
- ),
-);
-
-return $config;
\ No newline at end of file
diff --git a/module/VuFind/CLI/Module.php b/module/VuFindConsole/Module.php
similarity index 65%
rename from module/VuFind/CLI/Module.php
rename to module/VuFindConsole/Module.php
index a853bec7e7f68b8c9ed87af64ac1be47fcdeeced..4e51ee00d473065239a807e94eb67d3775c18abd 100644
--- a/module/VuFind/CLI/Module.php
+++ b/module/VuFindConsole/Module.php
@@ -1,7 +1,7 @@
<?php
-namespace VuFind\CLI;
-use VuFind\Mvc\Router\ConsoleRouter,
+namespace VuFindConsole;
+use VuFindConsole\Mvc\Router\ConsoleRouter,
Zend\ModuleManager\ModuleManager, Zend\Mvc\MvcEvent;
class Module
@@ -13,10 +13,13 @@ class Module
public function getAutoloaderConfig()
{
- // No extra configuration necessary; since this module uses a subset of the
- // VuFind namespace, its library code is in the main src area of the VuFind
- // module.
- return array();
+ return array(
+ 'Zend\Loader\StandardAutoloader' => array(
+ 'namespaces' => array(
+ __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
+ ),
+ ),
+ );
}
public function init(ModuleManager $m)
diff --git a/module/VuFindConsole/config/module.config.php b/module/VuFindConsole/config/module.config.php
new file mode 100644
index 0000000000000000000000000000000000000000..546a9a74eb69c37f426d8a3e27672ce611f786e0
--- /dev/null
+++ b/module/VuFindConsole/config/module.config.php
@@ -0,0 +1,14 @@
+<?php
+namespace VuFindConsole\Module\Configuration;
+
+$config = array(
+ 'controllers' => array(
+ 'invokables' => array(
+ 'harvest' => 'VuFindConsole\Controller\HarvestController',
+ 'import' => 'VuFindConsole\Controller\ImportController',
+ 'util' => 'VuFindConsole\Controller\UtilController',
+ ),
+ ),
+);
+
+return $config;
\ No newline at end of file
diff --git a/module/VuFind/src/VuFind/CLI/Controller/AbstractBase.php b/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
similarity index 98%
rename from module/VuFind/src/VuFind/CLI/Controller/AbstractBase.php
rename to module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
index 7bcea077c885f3b9238bc77e5661e19ce4276ffc..e6fcac5a2a3083d9fe41ff25b25ea21d49c32034 100644
--- a/module/VuFind/src/VuFind/CLI/Controller/AbstractBase.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
@@ -26,7 +26,7 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org/wiki/building_a_recommendations_module Wiki
*/
-namespace VuFind\CLI\Controller;
+namespace VuFindConsole\Controller;
use Zend\Console\Console, Zend\Console\Getopt,
Zend\Mvc\Controller\AbstractActionController;
diff --git a/module/VuFind/src/VuFind/CLI/Controller/HarvestController.php b/module/VuFindConsole/src/VuFindConsole/Controller/HarvestController.php
similarity index 99%
rename from module/VuFind/src/VuFind/CLI/Controller/HarvestController.php
rename to module/VuFindConsole/src/VuFindConsole/Controller/HarvestController.php
index ceacd2161965ff155b07a3d8512ea07e9805a18c..67c11bb21c76b9e78b4d61bc571853bc2265b93b 100644
--- a/module/VuFind/src/VuFind/CLI/Controller/HarvestController.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/HarvestController.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org/wiki/building_a_recommendations_module Wiki
*/
-namespace VuFind\CLI\Controller;
+namespace VuFindConsole\Controller;
use VuFind\Config\Reader as ConfigReader, VuFind\Harvester\NAF, VuFind\Harvester\OAI,
Zend\Console\Console;
diff --git a/module/VuFind/src/VuFind/CLI/Controller/ImportController.php b/module/VuFindConsole/src/VuFindConsole/Controller/ImportController.php
similarity index 99%
rename from module/VuFind/src/VuFind/CLI/Controller/ImportController.php
rename to module/VuFindConsole/src/VuFindConsole/Controller/ImportController.php
index caa4042ae310062df44cf4b1d2de7f206bea5611..32d9edb0c1bc41168c001726ad8e8a8864e0d983 100644
--- a/module/VuFind/src/VuFind/CLI/Controller/ImportController.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/ImportController.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org/wiki/building_a_recommendations_module Wiki
*/
-namespace VuFind\CLI\Controller;
+namespace VuFindConsole\Controller;
use VuFind\XSLT\Importer, Zend\Console\Console;
/**
diff --git a/module/VuFind/src/VuFind/CLI/Controller/UtilController.php b/module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php
similarity index 99%
rename from module/VuFind/src/VuFind/CLI/Controller/UtilController.php
rename to module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php
index d6d6b9fbf3ca061f523945e9cc3f24225e628a6f..ec346a0846946e683064a8fac7086295634973dc 100644
--- a/module/VuFind/src/VuFind/CLI/Controller/UtilController.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org/wiki/building_a_recommendations_module Wiki
*/
-namespace VuFind\CLI\Controller;
+namespace VuFindConsole\Controller;
use File_MARC, File_MARCXML, VuFind\Connection\Manager as ConnectionManager,
VuFind\Db\Table\Search as SearchTable, VuFind\Sitemap, Zend\Console\Console;
@@ -240,7 +240,7 @@ class UtilController extends AbstractBase
$query = $search->getExpiredQuery($daysOld);
if (($count = count($search->select($query))) == 0) {
Console::writeLine("No expired searches to delete.");
- return $this->getFailureResponse();
+ return $this->getSuccessResponse();
}
$search->delete($query);
Console::writeLine("{$count} expired searches deleted.");
diff --git a/module/VuFind/src/VuFind/Mvc/Router/ConsoleRouter.php b/module/VuFindConsole/src/VuFindConsole/Mvc/Router/ConsoleRouter.php
similarity index 99%
rename from module/VuFind/src/VuFind/Mvc/Router/ConsoleRouter.php
rename to module/VuFindConsole/src/VuFindConsole/Mvc/Router/ConsoleRouter.php
index e8a84609e79848f925ddc3f863a114b420fe8610..a45764bd1e41d4ebb6e0355ca9d192241fadd565 100644
--- a/module/VuFind/src/VuFind/Mvc/Router/ConsoleRouter.php
+++ b/module/VuFindConsole/src/VuFindConsole/Mvc/Router/ConsoleRouter.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org Main Site
*/
-namespace VuFind\Mvc\Router;
+namespace VuFindConsole\Mvc\Router;
use Zend\Mvc\Router\Http\RouteMatch, Zend\Mvc\Router\RouteStackInterface,
Zend\Stdlib\RequestInterface as Request;