From 1fb8c78fe0f8543c7379eccdf2ecfe72b015ab6a Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Tue, 19 Jan 2010 09:37:29 +0000
Subject: [PATCH] Installation: improved the reporting during data load

SVN:trunk[282]
---
 setup/xmldataloader.class.inc.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/setup/xmldataloader.class.inc.php b/setup/xmldataloader.class.inc.php
index 3cd29cab1..46ee3acec 100644
--- a/setup/xmldataloader.class.inc.php
+++ b/setup/xmldataloader.class.inc.php
@@ -168,14 +168,18 @@ class XMLDataLoader
 							$iExtKey = -$iDstObj; // Convention: Unresolved keys are stored as negative !
 							$oTargetObj->RegisterAsDirty();
 						}
-						// tested by Romain, little impact on perf (not significant on the intial setup)
+						// here we allow external keys to be invalid because we will resolve them later on...
 						//$oTargetObj->CheckValue($sAttCode, $iExtKey);
 						$oTargetObj->Set($sAttCode, $iExtKey);
 					}
 					else
 					{
 						// tested by Romain, little impact on perf (not significant on the intial setup)
-						//$oTargetObj->CheckValue($sAttCode, (string)$oXmlObj->$sAttCode);
+						if (!$oTargetObj->CheckValue($sAttCode, (string)$oXmlObj->$sAttCode))
+						{
+							SetupWebPage::log("Error - Value not allowed - $sClass/$iSrcId - $sAttCode: '".$oXmlObj->$sAttCode."'");
+							echo "Wrong value for attribute $sAttCode: '".$oXmlObj->$sAttCode."'";
+						}
 						$oTargetObj->Set($sAttCode, (string)$oXmlObj->$sAttCode);
 					}
 				}
@@ -219,6 +223,7 @@ class XMLDataLoader
 		}
 		catch(Exception $e)
 		{
+			SetupWebPage::log("Error - An object could not be loaded - $sClass/$iSrcId - ".$e->getMessage());
 			echo $e->GetHtmlDesc();
 		}
 		$aParentClasses = MetaModel::EnumParentClasses($sClass);