Skip to content
Snippets Groups Projects
Commit 68a3b671 authored by Ere Maijala's avatar Ere Maijala Committed by Demian Katz
Browse files

Add verbose mode to sitemap generator.

parent d8d2cf3f
No related merge requests found
...@@ -31,6 +31,7 @@ use VuFind\Search\BackendManager; ...@@ -31,6 +31,7 @@ use VuFind\Search\BackendManager;
use VuFindSearch\Backend\Solr\Backend; use VuFindSearch\Backend\Solr\Backend;
use VuFindSearch\ParamBag; use VuFindSearch\ParamBag;
use Zend\Config\Config; use Zend\Config\Config;
use Zend\Console\Console;
/** /**
* Class for generating sitemaps * Class for generating sitemaps
...@@ -106,6 +107,13 @@ class Generator ...@@ -106,6 +107,13 @@ class Generator
*/ */
protected $warnings = []; protected $warnings = [];
/**
* Verbose mode
*
* @var bool
*/
protected $verbose = false;
/** /**
* Mode of retrieving IDs from the index (may be 'terms' or 'search') * Mode of retrieving IDs from the index (may be 'terms' or 'search')
* *
...@@ -152,6 +160,21 @@ class Generator ...@@ -152,6 +160,21 @@ class Generator
} }
} }
/**
* Get/set verbose mode
*
* @param bool $newMode New verbose mode
*
* @return bool Current or new verbose mode
*/
public function setVerbose($newMode = null)
{
if (null !== $newMode) {
$this->verbose = $newMode;
}
return $this->verbose;
}
/** /**
* Generate the sitemaps based on settings established by the constructor. * Generate the sitemaps based on settings established by the constructor.
* *
...@@ -225,6 +248,9 @@ class Generator ...@@ -225,6 +248,9 @@ class Generator
// Update counters: // Update counters:
$count += $this->countPerPage; $count += $this->countPerPage;
if ($this->verbose) {
Console::writeLine("Page $currentPage processed");
}
$currentPage++; $currentPage++;
} }
return $currentPage; return $currentPage;
......
...@@ -78,7 +78,7 @@ $routes = [ ...@@ -78,7 +78,7 @@ $routes = [
'util/expire_sessions' => 'util expire_sessions [--help|-h] [--batch=] [--sleep=] [<daysOld>]', 'util/expire_sessions' => 'util expire_sessions [--help|-h] [--batch=] [--sleep=] [<daysOld>]',
'util/index_reserves' => 'util index_reserves [--help|-h] [-d=s] [-t=s] [-f=s]', 'util/index_reserves' => 'util index_reserves [--help|-h] [-d=s] [-t=s] [-f=s]',
'util/optimize' => 'util optimize [<core>]', 'util/optimize' => 'util optimize [<core>]',
'util/sitemap' => 'util sitemap', 'util/sitemap' => 'util sitemap [--verbose]',
'util/suppressed' => 'util suppressed [--help|-h] [--authorities] [--outfile=s]', 'util/suppressed' => 'util suppressed [--help|-h] [--authorities] [--outfile=s]',
'util/switch_db_hash' => 'util switch_db_hash [<newhash>] [<newkey>]', 'util/switch_db_hash' => 'util switch_db_hash [<newhash>] [<newkey>]',
]; ];
......
...@@ -283,6 +283,8 @@ class UtilController extends AbstractBase ...@@ -283,6 +283,8 @@ class UtilController extends AbstractBase
$this->serviceLocator->get('VuFind\Search\BackendManager'), $this->serviceLocator->get('VuFind\Search\BackendManager'),
$configLoader->get('config')->Site->url, $configLoader->get('sitemap') $configLoader->get('config')->Site->url, $configLoader->get('sitemap')
); );
$request = $this->getRequest();
$generator->setVerbose($request->getParam('verbose', false));
$generator->generate(); $generator->generate();
foreach ($generator->getWarnings() as $warning) { foreach ($generator->getWarnings() as $warning) {
Console::writeLine("$warning"); Console::writeLine("$warning");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment