Deploying new test

This commit is contained in:
Rick Falkvinge
2012-11-18 00:06:39 +00:00
parent 900d0c6878
commit d9d6c8ce14
2 changed files with 76 additions and 2 deletions
+28 -2
View File
@@ -128,6 +128,7 @@
$('#DivProgressDatabase').progressbar({ value: 0, max: 100 });
setTimeout('updateInitProgressBar();', 1000);
setTimeout('updateInitProgressMessage();', 1500);
$('#<%=this.ButtonInitDatabase.ClientID %>').click();
beginInitDatabase();
}
@@ -181,13 +182,37 @@
// We're not done yet. Keep the progress bar on-screen and keep re-checking.
$('#DivProgressDatabase').progressbar("value", msg.d);
setTimeout('updateInitProgressBar();', 0);
setTimeout('updateInitProgressBar();', 1500);
}
}
});
}
function beginInitDatabase() {
function updateInitProgressMessage() {
$.ajax({
type: "POST",
url: "Default.aspx/GetInitProgressMessage",
data: "{}",
contentType: "application/json; charset=utf-8",
dataType: "json",
success: function (msg) {
if (msg.d == 'Complete.') {
// We're done. Do nothing, the progress bar updater will do this step.
} else {
// We're not done yet. Keep the progress bar on-screen and keep re-checking.
$('#SpanInitProgressMessage').text(msg.d);
setTimeout('updateInitProgressMessage();', 2000);
}
}
});
}
function beginInitDatabase() {
$.ajax({
type: "POST",
url: "Default.aspx/InitDatabase",
@@ -443,6 +468,7 @@
<h2>Initializing database</h2>
<div id="DivProgressDatabase"></div>
<p>Please wait while the database is being initialized with schemas and geographic data from the Activizr servers. This is going to take a significant amount of time; we're loading tons of geodata onto your new server.</p>
<p><span id="SpanInitProgressMessage">Initializing...</span></p>
</div>
<div id="DivCreateFirstUser" style="display:none">
<h2>Step 3 Content</h2>
+48
View File
@@ -294,12 +294,14 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
// Ignore the session object, that method of sharing data didn't work, but a static variable did.
_initProgress = 1;
_initMessage = "Loading schema from Activizr servers; creating tables and procs...";
// Get the schema and initialize the database structures. Requires ADMIN access to database.
Activizr.Logic.Support.DatabaseMaintenance.FirstInitialization();
_initProgress = 5;
_initMessage = "Getting list of countries from Activizr servers...";
// Create translation lists
@@ -319,6 +321,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
Activizr.Site.Automation.Country[] countries = geoDataFetcher.GetCountries();
_initProgress = 7;
_initMessage = "Creating all countries on local server...";
// Create all countries in our own database
@@ -354,9 +357,12 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
{
// Get the geography layout
_initMessage = "Retrieving geography for " + countryCode + "...";
Activizr.Site.Automation.Geography geography = geoDataFetcher.GetGeographyForCountry(countryCode);
_initProgress = 10 + (int) (countryCount*initStepPerCountry + initStepPerCountry/6);
_initMessage = "Setting up geography for " + countryCode + "...";
// Create the country's root geography
@@ -368,6 +374,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
InitDatabaseThreadCreateGeographyChildren(geography.Children, countryRootGeographyId, ref geographyIdTranslation);
_initProgress = 10 + (int) (countryCount*initStepPerCountry + initStepPerCountry/3);
_initMessage = "Retrieving cities for " + countryCode + "...";
// Get the postal codes and cities
@@ -386,6 +393,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
_initProgress = 10 + (int) (countryCount*initStepPerCountry + initStepPerCountry/2);
_initMessage = "Retrieving postal codes for " + countryCode + "...";
Activizr.Site.Automation.PostalCode[] postalCodes = geoDataFetcher.GetPostalCodesForCountry(countryCode);
@@ -401,9 +409,15 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
// Insert cities
int newCountryId = countryIdTranslation[countryCode];
int cityCount = 0;
foreach (Activizr.Site.Automation.City city in cities)
{
if (!geographyIdTranslation.ContainsKey(city.GeographyId))
{
cityIdsUsedLookup[city.CityId] = false; // force non-use of invalid city
}
if (cityIdsUsedLookup[city.CityId])
{
int newGeographyId = geographyIdTranslation[city.GeographyId];
@@ -411,16 +425,42 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
newGeographyId);
cityIdTranslation[city.CityId] = newCityId;
}
if (cityCount % 100 == 0)
{
_initMessage = String.Format("Setting up cities for {0} ({1}/{2})...", countryCode, cityCount,
cities.Count());
}
cityCount++;
}
// Insert postal codes
_initProgress = 10 + (int) (countryCount*initStepPerCountry + initStepPerCountry*5/6);
int postalCodeCount = 0;
foreach (Activizr.Site.Automation.PostalCode postalCode in postalCodes)
{
if (cityIdsUsedLookup[postalCode.CityId] == false)
{
// Remnants of invalid pointers
postalCodeCount++;
continue;
}
int newCityId = cityIdTranslation[postalCode.CityId];
PirateDb.GetDatabaseForWriting().CreatePostalCode(postalCode.PostalCode, newCityId, newCountryId);
if (postalCodeCount % 100 == 0)
{
_initMessage = String.Format("Setting up postal codes for {0} ({1}/{2})...", countryCode, postalCodeCount,
postalCodes.Count());
}
postalCodeCount++;
}
countryCount++;
@@ -429,6 +469,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
}
_initProgress = 100;
_initMessage = "Complete.";
Thread.Sleep(1000); // give some time for static var to stick and web interface to react before killing thread
}
@@ -446,6 +487,7 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
private static int _initProgress = 0;
private static string _initMessage = "Initializing...";
[WebMethod]
@@ -466,6 +508,12 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
}
}
[WebMethod]
public static string GetInitProgressMessage()
{
return _initMessage;
}
[WebMethod]
public static bool VerifyHostName(string input)
{