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

Hardening of the setup script in case of error...

Browse Source 
SVN:trunk[480]
This commit is contained in:
Denis Flaven
2010-06-23 16:53:31 +00:00
parent 4a456e61a8
commit e77cfa4b94
1 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
setup/setup.js
View File

@@ -98,13 +98,19 @@ var aFilesToLoad = new Array();
function DoLoadDataAsynchronous()
{
// The array aFilesToLoad is populated by this function dynamically written on the server
PopulateDataFilesList();
$('#setup').block({message: '<p>Loading data...<br/><div id=\"progress\">0%</div></p>'});
$('#progress').progression( {Current:0, Maximum: 100, aBackgroundImg: 'orange-progress.gif', aTextColor: '#000000'} );
$('#log').ajaxError(function(e, xhr, settings, exception) { alert('Fatal error detected: '+ xhr.responseText); $('#log').append(xhr.responseText); $('#setup').unblock(); } );
LoadNextDataFile('', '');
try
{
// The array aFilesToLoad is populated by this function dynamically written on the server
PopulateDataFilesList();
$('#setup').block({message: '<p>Loading data...<br/><div id=\"progress\">0%</div></p>'});
$('#progress').progression( {Current:0, Maximum: 100, aBackgroundImg: 'orange-progress.gif', aTextColor: '#000000'} );
$('#log').ajaxError(function(e, xhr, settings, exception) { alert('Fatal error detected: '+ xhr.responseText); $('#log').append(xhr.responseText); $('#setup').unblock(); } );
LoadNextDataFile('', '');
}
catch(err)
{
alert('An exception occured: '+err);
}
return false; // Stop here for now
}
@@ -113,33 +119,40 @@ var iCounter = 0;
function LoadNextDataFile(sData, sTextStatus)
{
//$("#progress").html(sData);
if (iCounter < aFilesToLoad.length)
try
{
if (iCounter == (aFilesToLoad.length - 1))
if (iCounter < aFilesToLoad.length)
{
// Last file in the list (or only 1 file), this completes the session
sSessionStatus = 'end';
}
else if (iCounter == 0)
{
// First file in the list, start the session
sSessionStatus = 'start';
if (iCounter == (aFilesToLoad.length - 1))
{
// Last file in the list (or only 1 file), this completes the session
sSessionStatus = 'end';
}
else if (iCounter == 0)
{
// First file in the list, start the session
sSessionStatus = 'start';
}
else
{
sSessionStatus = 'continue';
}
iPercent = Math.round((100.0 * (1+iCounter)) / aFilesToLoad.length);
sFileName = aFilesToLoad[iCounter];
//alert('Loading file '+sFileName+' ('+iPercent+' %) - '+sSessionStatus);
$("#progress").progression({ Current: iPercent });
iCounter++;
$.get( 'ajax.dataloader.php', { 'file': sFileName, 'percent': iPercent, 'session_status': sSessionStatus }, LoadNextDataFile, 'html');
}
else
{
sSessionStatus = 'continue';
// We're done
$('#setup').unblock();
$('#GoToNextStep').submit(); // Use the hidden form to navigate to the next step
}
iPercent = Math.round((100.0 * (1+iCounter)) / aFilesToLoad.length);
sFileName = aFilesToLoad[iCounter];
//alert('Loading file '+sFileName+' ('+iPercent+' %) - '+sSessionStatus);
$("#progress").progression({ Current: iPercent });
iCounter++;
$.get( 'ajax.dataloader.php', { 'file': sFileName, 'percent': iPercent, 'session_status': sSessionStatus }, LoadNextDataFile, 'html');
}
else
catch(err)
{
// We're done
$('#setup').unblock();
$('#GoToNextStep').submit(); // Use the hidden form to navigate to the next step
alert('An exception occurred: '+err);
}
}