diff --git a/web/Admin/DataManager.cs b/web/Admin/DataManager.cs index 76d33937..fb994200 100644 --- a/web/Admin/DataManager.cs +++ b/web/Admin/DataManager.cs @@ -4,6 +4,7 @@ using System.IO; using Yavsc.Model.Admin; using Npgsql.Web.Blog; using System.Resources; +using System.Reflection; namespace Yavsc.Admin { @@ -91,11 +92,12 @@ namespace Yavsc.Admin string sql; try { - using (Stream sqlStream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("Yavsc.instdbws.sql")) + Assembly a = System.Reflection.Assembly.GetExecutingAssembly(); + using (Stream sqlStream = a.GetManifestResourceStream("Yavsc.instdbws.sql")) { - using (StreamReader srdr = new StreamReader (sqlStream)) { + try { using (StreamReader srdr = new StreamReader (sqlStream)) { sql = srdr.ReadToEnd (); - using (var cnx = new Npgsql.NpgsqlConnection (da.ConnectionString())) { + using (var cnx = new Npgsql.NpgsqlConnection (da.ConnectionString)) { using (var cmd = cnx.CreateCommand ()) { cmd.CommandText = sql; cnx.Open(); @@ -103,6 +105,12 @@ namespace Yavsc.Admin cnx.Close(); } } + } } catch (Exception exg) { + res.ExitCode = 1; + res.Error = + string.Format ("Exception of type {0} occred retrieving the script", + exg.GetType ().Name); + res.Message = exg.Message; } } } diff --git a/web/Controllers/AdminController.cs b/web/Controllers/AdminController.cs index 0e667e71..48913639 100644 --- a/web/Controllers/AdminController.cs +++ b/web/Controllers/AdminController.cs @@ -11,7 +11,6 @@ using Yavsc.Admin; using System.IO; using Yavsc.Model; - namespace Yavsc.Controllers { /// @@ -40,11 +39,10 @@ namespace Yavsc.Controllers { if (doInit=="on") { if (ModelState.IsValid) { - // TODO BETTER datac.BackupPrefix = Server.MapPath (datac.BackupPrefix); DataManager mgr = new DataManager (datac); - TaskOutput t = mgr.CreateDb (); - return View ("Created", t); + TaskOutput tcdb = mgr.CreateDb (); + return View ("Created", tcdb); } } return View (); diff --git a/web/Models/App.master b/web/Models/App.master index 54b3a9ca..06b8e660 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -34,8 +34,8 @@ ViewState["orgtitle"] = T.GetString(Page.Title); - - + + -
+
 /// The string. - public string ConnectionString() { - return string.Format ("Server={0};Port={1};Database={2};User Id={3};Password={4};Encoding=Unicode;", - Host,Port,Dbuser,Password); - } + public string ConnectionString { get { return string.Format ("Server={0};Port={1};Database={2};User Id={3};Password={4};Encoding=Unicode;", + Host, Port, Dbname, Dbuser, Password); } } } }