From dde3efc0c703568b1304bafb61ad2321cd202d08 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Mon, 29 Aug 2011 13:20:44 +0000 Subject: [PATCH] Upgrade: adjust data sources, and be more verbose about upgrades in the DB (HKeys and data sources) SVN:trunk[1531] --- setup/setuppage.class.inc.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php index 9d43f84e5..58d6c762f 100644 --- a/setup/setuppage.class.inc.php +++ b/setup/setuppage.class.inc.php @@ -675,9 +675,19 @@ function CreateDatabaseStructure(Config $oConfig, $aSelectedModules, $sMode) if (MetaModel::DBExists(/* bMustBeComplete */ false)) { MetaModel::DBCreate(); - SetupWebPage::log_ok("Database structure successfully created."); + SetupWebPage::log_ok("Database structure successfully updated."); + // Check (and update only if it seems needed) the hierarchical keys - MetaModel::CheckHKeys(false /* bDiagnosticsOnly */, false /* bVerbose*/, true /* bForceUpdate */); // Since in 1.2-beta the detection was buggy, let's force the rebuilding of HKeys + ob_start(); + MetaModel::CheckHKeys(false /* bDiagnosticsOnly */, true /* bVerbose*/, true /* bForceUpdate */); // Since in 1.2-beta the detection was buggy, let's force the rebuilding of HKeys + $sFeedback = ob_get_clean(); + SetupWebPage::log_ok("Hierchical keys rebuilt: $sFeedback"); + + // Check (and fix) data sync configuration + ob_start(); + MetaModel::CheckDataSources(false /*$bDiagnostics*/, true/*$bVerbose*/); + $sFeedback = ob_get_clean(); + SetupWebPage::log_ok("Data sources checked: $sFeedback"); } else {