composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 02:28:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Setup: Display the XML errors on the screen

Browse Source 
SVN:trunk[5716]
This commit is contained in:
Eric Espié
2018-04-20 15:56:53 +00:00
parent ea11b76461
commit b529f3d4cc
4 changed files with 115 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
setup/modelfactory.class.inc.php
View File

@@ -619,8 +619,11 @@ class ModelFactory
/**
* Loads the definitions corresponding to the given Module
*
* @param MFModule $oModule
* @param Array $aLanguages The list of languages to process (for the dictionaries). If empty all languages are kept
* @param array $aLanguages The list of languages to process (for the dictionaries). If empty all languages are kept
*
* @throws \Exception
*/
public function LoadModule(MFModule $oModule, $aLanguages = array())
{
@@ -628,7 +631,6 @@ class ModelFactory
{
$aDataModels = $oModule->GetDataModelFiles();
$sModuleName = $oModule->GetName();
$aClasses = array();
self::$aLoadedModules[] = $oModule;
// For persistence in the cache
@@ -644,12 +646,10 @@ class ModelFactory
$oDocument = new MFDocument();
libxml_clear_errors();
$oDocument->load($sXmlFile);
//$bValidated = $oDocument->schemaValidate(APPROOT.'setup/itop_design.xsd');
$aErrors = libxml_get_errors();
if (count($aErrors) > 0)
{
self::$aLoadErrors[$sModuleName] = $aErrors;
return;
throw new Exception($this->GetXMLErrorMessage($aErrors));
}
$oXPath = new DOMXPath($oDocument);
@@ -826,11 +826,23 @@ class ModelFactory
{
return (count(self::$aLoadErrors) > 0);
}
function GetLoadErrors()
{
return self::$aLoadErrors;
}
function GetXMLErrorMessage($aErrors)
{
$sMessage = "Data model source file ({$aErrors[0]->file}) could not be loaded : \n";
foreach($aErrors as $oXmlError)
{
// XML messages already ends with \n
$sMessage .= $oXmlError->message;
}
return $sMessage;
}
function GetLoadedModules($bExcludeWorkspace = true)
{
if ($bExcludeWorkspace)