diff --git a/library/Class/Import/Typo3.php b/library/Class/Import/Typo3.php index 094fd8e2e7cdcae6cfe90816231fd70b3173b00c..f2aecfb25991bc3a8ad3c22619a00c5d714ad9bc 100644 --- a/library/Class/Import/Typo3.php +++ b/library/Class/Import/Typo3.php @@ -61,28 +61,28 @@ class Class_Import_Typo3 { $_SERVER['HTTP_HOST']='localhost'; if ($what == 'all' || $what == 'users') { - echo "Importing users\n"; + Class_Import_Typo3_Logs::getInstance()->addLogRow("\n\n ******** Importing users"); $this->import_user(); } if ($what == 'all' || $what == 'articles') { - echo "Importing categories\n"; + Class_Import_Typo3_Logs::getInstance()->addLogRow("\n\n ******** Importing categories"); $this->import_categories(); - echo "Importing articles pages\n"; + Class_Import_Typo3_Logs::getInstance()->addLogRow("\n\n ******** Importing articles pages"); $this->importArticlesPages(); - echo "Importing articles\n"; + Class_Import_Typo3_Logs::getInstance()->addLogRow("\n\n ******** Importing articles"); $this->importArticles(); - echo "Importing events\n"; + Class_Import_Typo3_Logs::getInstance()->addLogRow("\n\n ******** Importing events"); $this->importCalendar(); - echo "Importing sites\n"; + Class_Import_Typo3_Logs::getInstance()->addLogRow("\n\n ******** Importing sites"); $this->importSites(); } - Class_Import_Typo3_Logs::getInstance()->report(); + return Class_Import_Typo3_Logs::getInstance()->report(); } diff --git a/library/Class/Import/Typo3/Logs.php b/library/Class/Import/Typo3/Logs.php index 9ef4e4cb19324f1b2159302194df5bf94c126477..161c4bacc35ef5d293ac72c8cc89a39c6d0da4f4 100644 --- a/library/Class/Import/Typo3/Logs.php +++ b/library/Class/Import/Typo3/Logs.php @@ -35,7 +35,8 @@ class Class_Import_Typo3_logs { $_saved_domains = 0, $_rejected_articles, $_saved_categories_article = 0, - $_saved_categories_sito = 0; + $_saved_categories_sito = 0, + $_output_activated = false; public static function getInstance() { @@ -46,6 +47,12 @@ class Class_Import_Typo3_logs { } + public function activateOutput() { + $this->_output_activated = true; + return $this; + } + + public function getLogs() { return $this->_logs; } @@ -56,7 +63,10 @@ class Class_Import_Typo3_logs { public function addLogRow($log) { - $this->_logs .= $log . '\n'; + $this->_logs .= $log . "\n"; + if ($this->_output_activated) { + echo $log."\n"; + } return $this; } diff --git a/scripts/import_typo3.php b/scripts/import_typo3.php index 912adb82d9bb3a8357974466a48022a40ab8f141..13c0e102fae4c412b47f7b0f7b266e48766d25c9 100644 --- a/scripts/import_typo3.php +++ b/scripts/import_typo3.php @@ -11,7 +11,8 @@ require('console.php'); $toRun = $argv[1]; +Class_Import_Typo3_Logs::getInstance()->activateOutput(); + $migration = new Class_Import_Typo3(); $migration->run($toRun); - ?> \ No newline at end of file