X-Git-Url: https://code.racktables.org/racktables/blobdiff_plain/414fbf5fd859f5051939355d00828db1fedff872..3fb336f61b4bd352b54b7a6c4dc560cc9f4350e4:/install.php diff --git a/install.php b/install.php index 9ed3d5ef..48727727 100644 --- a/install.php +++ b/install.php @@ -25,6 +25,7 @@ if ($step > count ($stepfunc)) exit; } $title = "RackTables installation: step ${step} of " . count ($stepfunc); +require_once ('inc/dictionary.php'); ?> @@ -307,7 +308,7 @@ function init_database_static () echo ''; echo ""; $errlist = array(); - foreach (array ('structure', 'dictbase', 'dictvendors') as $part) + foreach (array ('structure', 'dictbase') as $part) { $filename = "install/init-${part}.sql"; echo ""; @@ -341,6 +342,23 @@ function init_database_static () } echo "\n"; } + // (re)load dictionary by pure PHP means w/o any external file + echo ""; + $nq = $nerrs = 0; + global $dictreload; + $dictq = array(); + foreach ($dictreload as $tmp) + foreach (reloadDictionary ($tmp['from'], $tmp['to']) as $query) + { + $nq++; + if ($dbxlink->exec ($query) === FALSE) + { + $nerrs++; + $errlist[] = $query; + } + } + echo "\n"; + echo '
filequerieserrors
${filename}${nq}${nerrs}
dictionary${nq}${nerrs}
'; if (count ($errlist)) {