';
@@ -421,12 +446,12 @@ try
{
if (!empty($sAttCode) && ($sAttCode != ':none:') && ($sAttCode != 'finalclass'))
{
- $oCellStatus = $aRes[$iLine][$iNumber -1];
+ $oCellStatus = $aResRow[$iNumber -1];
$sCellMessage = '';
if (isset($aExternalKeysByColumn[$iNumber -1]))
{
$sExtKeyName = $aExternalKeysByColumn[$iNumber -1];
- $oExtKeyCellStatus = $aRes[$iLine][$sExtKeyName];
+ $oExtKeyCellStatus = $aResRow[$sExtKeyName];
switch(get_class($oExtKeyCellStatus))
{
case 'CellStatus_Issue':
@@ -443,34 +468,34 @@ try
// Do nothing
}
}
+ $sHtmlValue = htmlentities($oCellStatus->GetValue(), ENT_QUOTES, 'UTF-8');
switch(get_class($oCellStatus))
{
case 'CellStatus_Issue':
$sCellMessage .= $oPage->GetP($oCellStatus->GetDescription());
- $sHtml .= '| ERROR: '.htmlentities($aData[$iLine][$iNumber-1], ENT_QUOTES, 'UTF-8').$sCellMessage.' | ';
+ $sHtml .= 'ERROR: '.$sHtmlValue.$sCellMessage.' | ';
break;
case 'CellStatus_SearchIssue':
$sCellMessage .= $oPage->GetP($oCellStatus->GetDescription());
- $sHtml .= 'ERROR: '.htmlentities($aData[$iLine][$iNumber-1], ENT_QUOTES, 'UTF-8').$sCellMessage.' | ';
+ $sHtml .= 'ERROR: '.$sHtmlValue.$sCellMessage.' | ';
break;
case 'CellStatus_Ambiguous':
$sCellMessage .= $oPage->GetP($oCellStatus->GetDescription());
- $sHtml .= 'AMBIGUOUS: '.htmlentities($aData[$iLine][$iNumber-1], ENT_QUOTES, 'UTF-8').$sCellMessage.' | ';
+ $sHtml .= 'AMBIGUOUS: '.$sHtmlValue.$sCellMessage.' | ';
break;
case 'CellStatus_Modify':
- $sHtml .= ''.htmlentities($aData[$iLine][$iNumber-1], ENT_QUOTES, 'UTF-8').' | ';
+ $sHtml .= ''.$sHtmlValue.' | ';
break;
default:
- $sHtml .= ''.htmlentities($aData[$iLine][$iNumber-1], ENT_QUOTES, 'UTF-8').$sCellMessage.' | ';
+ $sHtml .= ''.$sHtmlValue.$sCellMessage.' | ';
}
}
}
$sHtml .= "$sMessage | ";
- $iLine++;
$sHtml .= '
';
}
$sHtml .= '';
diff --git a/test/testlist.inc.php b/test/testlist.inc.php
index 6a5a08f09..9dbb4d7ec 100644
--- a/test/testlist.inc.php
+++ b/test/testlist.inc.php
@@ -987,8 +987,8 @@ class TestBulkChangeOnFarm extends TestBizModel
$oParser = new CSVParser("denomination,hauteur,age
suzy,123,2009-01-01
chita,456,
- ");
- $aData = $oParser->ToArray(array('_name', '_height', '_birth'), ',');
+ ", ',', '"');
+ $aData = $oParser->ToArray(1, array('_name', '_height', '_birth'));
self::DumpVariable($aData);
$oBulk = new BulkChange(
@@ -1193,6 +1193,73 @@ class TestItopEfficiency extends TestBizModel
}
}
+///////////////////////////////////////////////////////////////////////////
+// Test bulk load API
+///////////////////////////////////////////////////////////////////////////
+
+class TestItopBulkLoad extends TestBizModel
+{
+ static public function GetName()
+ {
+ return 'Itop - test BulkChange class';
+ }
+
+ static public function GetDescription()
+ {
+ return 'Execute a bulk change at the Core API level';
+ }
+
+ static public function GetConfigFile() {return '/config-itop.php';}
+
+
+ protected function DoExecute()
+ {
+ $oParser = new CSVParser("name,org_id->name,brand,model
+ Server1,Demo,,
+ server4,Demo,,
+ ", ',', '"');
+ $aData = $oParser->ToArray(1, array('_name', '_org_name', '_brand', '_model'));
+ self::DumpVariable($aData);
+
+ $oBulk = new BulkChange(
+ 'Server',
+ $aData,
+ // attributes
+ array('name' => '_name', 'brand' => '_brand', 'model' => '_model'),
+ // ext keys
+ array('org_id' => array('name' => '_org_name')),
+ // reconciliation
+ array('name'),
+ // Synchro - scope
+ "SELECT Server",
+ // Synchro - set attribute on missing objects
+ array ('brand' => 'you let package', 'model' => 'tpe', 'cpu' => 'it is pay you')
+ );
+
+ if (false)
+ {
+ $oMyChange = MetaModel::NewObject("CMDBChange");
+ $oMyChange->Set("date", time());
+ $oMyChange->Set("userinfo", "Testor");
+ $iChangeId = $oMyChange->DBInsert();
+// echo "Created new change: $iChangeId";
+ }
+
+ echo "
';
$sCSSRowClass = 'row_unchanged';
@@ -379,16 +383,33 @@ try
case 'RowStatus_Modify':
$iModified++;
- $sFinalClass = $aRes[$iLine]['finalclass'];
- $oObj = MetaModel::GetObject($sFinalClass, $aRes[$iLine]['id']->GetValue());
+ $sFinalClass = $aResRow['finalclass'];
+ $oObj = MetaModel::GetObject($sFinalClass, $aResRow['id']->GetValue());
$sUrl = $oObj->GetHyperlink();
$sStatus = '
';
$sCSSRowClass = 'row_modified';
break;
+ case 'RowStatus_Disappeared':
+ $iModified++;
+ $sFinalClass = $aResRow['finalclass'];
+ $oObj = MetaModel::GetObject($sFinalClass, $aResRow['id']->GetValue());
+ $sUrl = $oObj->GetHyperlink();
+ $sStatus = '
';
+ $sCSSRowClass = 'row_modified';
+ if ($bSimulate)
+ {
+ $sMessage = 'Missing object: will be updated';
+ }
+ else
+ {
+ $sMessage = 'Missing object: updated';
+ }
+ break;
+
case 'RowStatus_NewObj':
$iCreated++;
- $sFinalClass = $aRes[$iLine]['finalclass'];
+ $sFinalClass = $aResRow['finalclass'];
$sStatus = '
';
$sCSSRowClass = 'row_added';
if ($bSimulate)
@@ -397,8 +418,8 @@ try
}
else
{
- $sFinalClass = $aRes[$iLine]['finalclass'];
- $oObj = MetaModel::GetObject($sFinalClass, $aRes[$iLine]['id']->GetValue());
+ $sFinalClass = $aResRow['finalclass'];
+ $oObj = MetaModel::GetObject($sFinalClass, $aResRow['id']->GetValue());
$sUrl = $oObj->GetHyperlink();
$sMessage = 'Object created';
}
@@ -410,7 +431,11 @@ try
$sStatus = '
';
$sCSSMessageClass = 'cell_error';
$sCSSRowClass = 'row_error';
- $aResult[] = $sTextQualifier.implode($sTextQualifier.$sSeparator.$sTextQualifier,$aRow).$sTextQualifier; // Remove the first line and store it in case of error
+ if (array_key_exists($iLine, $aData))
+ {
+ $aRow = $aData[$iLine];
+ $aResult[] = $sTextQualifier.implode($sTextQualifier.$sSeparator.$sTextQualifier,$aRow).$sTextQualifier; // Remove the first line and store it in case of error
+ }
break;
}
$sHtml .= '