composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added a flag to force the import to cinutnue even in case of SQL error... useful for debugging don't use in production ;-)

Browse Source 
SVN:trunk[1521]
This commit is contained in:
Denis Flaven
2011-08-25 17:37:56 +00:00
parent 20a06c9212
commit 186ba76092
1 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
synchro/synchro_import.php
View File

@@ -143,6 +143,13 @@ $aPageParams = array
'default' => '',
'description' => 'Comment to be added into the change log',
),
'no_stop_on_import_error' => array
(
'mandatory' => false,
'modes' => 'http,cli',
'default' => '0',
'description' => 'Don\'t stop the import in case of SQL import error. By default the import will stop at the first error (and rollback all changes). If this flag is set to 1 the import will continue anyway',
),
);
function UsageAndExit($oP)
@@ -293,6 +300,7 @@ try
// $sReportLevel = ReadParam($oP, 'reportlevel');
$sSimulate = ReadParam($oP, 'simulate');
$sComment = ReadParam($oP, 'comment', 'raw_data');
$sNoStopOnImportError = ReadParam($oP, 'no_stop_on_import_error');
$oLoadStartDate = new DateTime(); // Now
@@ -487,7 +495,22 @@ try
}
$sValues = implode(', ', $aValues);
$sInsert = "INSERT INTO `$sTable` ($sInsertColumns) VALUES ($sValues)";
CMDBSource::Query($sInsert);
try
{
CMDBSource::Query($sInsert);
}
catch(Exception $e)
{
if ($sNoStopOnImportError == '1')
{
$iCountErrors++;
$oP->add("$iRow: Import error '".$e->getMessage()."' (continuing)...\n");
}
else // Fatal error
{
throw $e;
}
}
}
elseif ($iCount == 1)
{
@@ -529,7 +552,22 @@ try
}
$sValuePairs = implode(', ', $aValuePairs);
$sUpdateQuery = "UPDATE `$sTable` SET $sValuePairs WHERE $sReconciliationCondition";
CMDBSource::Query($sUpdateQuery);
try
{
CMDBSource::Query($sUpdateQuery);
}
catch(Exception $e)
{
if ($sNoStopOnImportError == '1')
{
$iCountErrors++;
$oP->add("$iRow: Import error '".$e->getMessage()."' (continuing)...\n");
}
else // Fatal error
{
throw $e;
}
}
}
else
{