From 978b0ed546aebbe04cbe364dd050eaec18da5512 Mon Sep 17 00:00:00 2001 From: Silvio Date: Thu, 18 Nov 2010 16:18:12 -0200 Subject: Enhancing isis:batch --- lib/sfIsisImporterManager.class.php | 1 + lib/task/isisBatchTask.class.php | 8 ++++---- lib/task/isisImportTask.class.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/sfIsisImporterManager.class.php b/lib/sfIsisImporterManager.class.php index aa8ecb8..ebde07b 100644 --- a/lib/sfIsisImporterManager.class.php +++ b/lib/sfIsisImporterManager.class.php @@ -133,6 +133,7 @@ class sfIsisImporterManager extends IsisConnector if ($importer) { $this->log("Database $database: ". $importer->isis->entries .' rows.'); + return $importer->isis->entries; } } } diff --git a/lib/task/isisBatchTask.class.php b/lib/task/isisBatchTask.class.php index 95be44c..02cb526 100644 --- a/lib/task/isisBatchTask.class.php +++ b/lib/task/isisBatchTask.class.php @@ -27,7 +27,7 @@ EOF; protected function execute($arguments = array(), $options = array()) { - // initialize the database connection + // Initialize the database connection. $databaseManager = new sfDatabaseManager($this->configuration); $connection = $databaseManager->getDatabase($options['connection'])->getConnection(); @@ -46,15 +46,15 @@ EOF; foreach ($databases as $database) { - $rows = (isset($arguments['rows'])) ? $argument['rows'] : 20; - $max = 1000; // TODO + $rows = (isset($arguments['rows'])) ? $argument['rows'] : 100; + $max = $isis->info($this, 'task', $database); for ($offset = 0; $offset <= $max; $offset = $offset + $rows) { $pid = pcntl_fork(); if ($pid == -1) { - die('Could not fork'); + die('Could not fork.'); } else if ($pid) { diff --git a/lib/task/isisImportTask.class.php b/lib/task/isisImportTask.class.php index 124932c..eb8b500 100644 --- a/lib/task/isisImportTask.class.php +++ b/lib/task/isisImportTask.class.php @@ -27,7 +27,7 @@ EOF; protected function execute($arguments = array(), $options = array()) { - // initialize the database connection + // Initialize the database connection. $databaseManager = new sfDatabaseManager($this->configuration); $connection = $databaseManager->getDatabase($options['connection'])->getConnection(); -- cgit v1.2.3