Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2022-05-12 17:35:36 +02:00
commit 307b524d11
2 changed files with 15 additions and 2 deletions

View File

@ -36,6 +36,11 @@ class SeedDMS_FulltextService {
*/ */
protected $conversionmgr; protected $conversionmgr;
/**
* @var logger
*/
protected $logger;
/** /**
* Max file size for imediate indexing * Max file size for imediate indexing
*/ */
@ -49,6 +54,7 @@ class SeedDMS_FulltextService {
$this->services = array(); $this->services = array();
$this->converters = array(); $this->converters = array();
$this->conversionmgr = null; $this->conversionmgr = null;
$this->logger = null;
$this->maxsize = 0; $this->maxsize = 0;
$this->index = null; $this->index = null;
$this->search = null; $this->search = null;
@ -63,6 +69,10 @@ class SeedDMS_FulltextService {
$this->converters = $converters; $this->converters = $converters;
} }
public function setLogger($logger) {
$this->logger = $logger;
}
/** /**
* Set conversion service manager * Set conversion service manager
* *

View File

@ -18,12 +18,13 @@ function usage() { /* {{{ */
echo " -h, --help: print usage information and exit.".PHP_EOL; echo " -h, --help: print usage information and exit.".PHP_EOL;
echo " -v, --version: print version and exit.".PHP_EOL; echo " -v, --version: print version and exit.".PHP_EOL;
echo " -c: recreate index.".PHP_EOL; echo " -c: recreate index.".PHP_EOL;
echo " --no-log: do not log.".PHP_EOL;
echo " --config: set alternative config file.".PHP_EOL; echo " --config: set alternative config file.".PHP_EOL;
} /* }}} */ } /* }}} */
$version = "0.0.2"; $version = "0.0.3";
$shortoptions = "hvc"; $shortoptions = "hvc";
$longoptions = array('help', 'version', 'config:'); $longoptions = array('help', 'version', 'config:', 'no-log');
if(false === ($options = getopt($shortoptions, $longoptions))) { if(false === ($options = getopt($shortoptions, $longoptions))) {
usage(); usage();
exit(0); exit(0);
@ -55,6 +56,8 @@ if(isset($options['c'])) {
} }
include($myincpath."/inc/inc.Settings.php"); include($myincpath."/inc/inc.Settings.php");
if(empty($options['no-log']))
include($myincpath."/inc/inc.LogInit.php");
include($myincpath."/inc/inc.Init.php"); include($myincpath."/inc/inc.Init.php");
include($myincpath."/inc/inc.Extension.php"); include($myincpath."/inc/inc.Extension.php");
include($myincpath."/inc/inc.DBInit.php"); include($myincpath."/inc/inc.DBInit.php");