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

- Don't create warnings for empty ext keys (i.e. empty string)

Browse Source 
- Properly record multiple warnings
- Don't record warnings in case of creation error (error has precedence)

SVN:trunk[1688]
This commit is contained in:
Denis Flaven
2011-11-23 09:51:57 +00:00
parent 7a83237f11
commit e30bfb53c6
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
synchro/synchrodatasource.class.inc.php
View File

@@ -1737,7 +1737,7 @@ class SynchroReplica extends DBObject implements iDisplay
break;
default:
$sWarningMessage = count($this->aWarnings)." warnings: ".implode(' '.$this->aWarnings);
$sWarningMessage = count($this->aWarnings)." warnings: ".implode(' ', $this->aWarnings);
break;
}
@@ -1845,10 +1845,18 @@ class SynchroReplica extends DBObject implements iDisplay
$oStatLog->AddTrace("Nothing found on: $sConditionDesc", $this);
if ($oDataSource->Get('action_on_zero') == 'create')
{
$this->CreateObjectFromReplica($oDataSource->GetTargetClass(), $aAttributes, $oChange, $oStatLog);
if ($this->HasWarnings())
$bCreated = $this->CreateObjectFromReplica($oDataSource->GetTargetClass(), $aAttributes, $oChange, $oStatLog);
if ($bCreated)
{
$oStatLog->Inc('stats_nb_obj_created_warnings');
if ($this->HasWarnings())
{
$oStatLog->Inc('stats_nb_obj_created_warnings');
}
}
else
{
// Creation error has precedence over any warning
$this->ResetWarnings();
}
}
else // assumed to be 'error'
@@ -1901,10 +1909,18 @@ class SynchroReplica extends DBObject implements iDisplay
}
elseif ($oDataSource->Get('action_on_multiple') == 'create')
{
$this->CreateObjectFromReplica($oDataSource->GetTargetClass(), $aAttributes, $oChange, $oStatLog);
if ($this->HasWarnings())
$bCreated = $this->CreateObjectFromReplica($oDataSource->GetTargetClass(), $aAttributes, $oChange, $oStatLog);
if ($bCreated)
{
$oStatLog->Inc('stats_nb_obj_created_warnings');
if ($this->HasWarnings())
{
$oStatLog->Inc('stats_nb_obj_created_warnings');
}
}
else
{
// Creation error has precedence over any warning
$this->ResetWarnings();
}
}
else
@@ -2014,9 +2030,11 @@ class SynchroReplica extends DBObject implements iDisplay
/**
* Creates the destination object populating it with the Extended data found in the synchro_data_XXXX table
* @return bool Whether or not the object was created
*/
protected function CreateObjectFromReplica($sClass, $aAttributes, $oChange, &$oStatLog)
{
$bCreated = false;
$oDestObj = MetaModel::NewObject($sClass);
try
{
@@ -2038,6 +2056,7 @@ class SynchroReplica extends DBObject implements iDisplay
$this->Set('status_last_error', '');
$this->Set('status', 'synchronized');
$this->Set('info_creation_date', date('Y-m-d H:i:s'));
$bCreated = true;
$oStatLog->AddTrace("Created (".implode(', ', $aValueTrace).")", $this);
$oStatLog->Inc('stats_nb_obj_created');
@@ -2048,6 +2067,7 @@ class SynchroReplica extends DBObject implements iDisplay
$this->SetLastError('Unable to create destination object: ', $e);
$oStatLog->Inc('stats_nb_obj_created_errors');
}
return $bCreated;
}
/**
@@ -2165,9 +2185,12 @@ class SynchroReplica extends DBObject implements iDisplay
}
else
{
// Note: differs from null (in which case the value would be left unchanged)
$oStatLog->AddTrace("Could not find [unique] object for '$sExtAttCode': searched on $sReconcAttCode = '$rawValue'", $this);
$this->AddWarning("Could not find [unique] object for '$sExtAttCode': searched on $sReconcAttCode = '$rawValue'");
if ($rawValue != '')
{
// Note: differs from null (in which case the value would be left unchanged)
$oStatLog->AddTrace("Could not find [unique] object for '$sExtAttCode': searched on $sReconcAttCode = '$rawValue'", $this);
$this->AddWarning("Could not find [unique] object for '$sExtAttCode': searched on $sReconcAttCode = '$rawValue'");
}
$retValue = 0;
}
}