From 4d64856fcd67f824f7a02725f7de075ea98e9fdf Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 5 May 2014 20:44:51 +0000 Subject: [PATCH] Add some more time every 100 rows as long as things are still going --- ...lass.importexport_basic_import_csv.inc.php | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/importexport/inc/class.importexport_basic_import_csv.inc.php b/importexport/inc/class.importexport_basic_import_csv.inc.php index 7c9e93d502..53a4ffbc10 100644 --- a/importexport/inc/class.importexport_basic_import_csv.inc.php +++ b/importexport/inc/class.importexport_basic_import_csv.inc.php @@ -170,6 +170,12 @@ abstract class importexport_basic_import_csv implements importexport_iface_impor if($success) $count++; + // Add some more time + if($success && $import_csv->get_current_position() > 0 && $import_csv->get_current_position() % 100 == 0) + { + set_time_limit(10); + } + // Keep a few records for preview, but process the whole file if($this->dry_run && $import_csv->get_current_position() < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) { @@ -373,27 +379,27 @@ abstract class importexport_basic_import_csv implements importexport_iface_impor } /** - * Returns errors that were encountered during importing - * Maximum of one error message per record, but you can append if you need to - * - * @return Array ( - * record_# => error message - * ) - */ - public function get_errors() { + * Returns errors that were encountered during importing + * Maximum of one error message per record, but you can append if you need to + * + * @return Array ( + * record_# => error message + * ) + */ + public function get_errors() { return $this->errors; } /** - * Returns a list of actions taken, and the number of records for that action. - * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin. - * - * @return Array ( - * action => record count - * ) - */ - public function get_results() { - return $this->results; - } + * Returns a list of actions taken, and the number of records for that action. + * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin. + * + * @return Array ( + * action => record count + * ) + */ + public function get_results() { + return $this->results; + } } // end of iface_export_plugin ?>