5 files changed, 24 insertions, 4 deletions

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
index 46183b4..6ac8cc3 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
@@ -14,7 +14,15 @@ namespace OpenGrid.Framework.Data.MySQL
         /// </summary>

         public void Initialise()

         {

-            database = new MySQLManager("localhost", "database", "username", "password", "false");

+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");

+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");

+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");

+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");

+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");

+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");

+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");

+

+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);

         }

 

         /// <summary>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
index 670d3c9..ea7e2ac 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
@@ -25,11 +25,11 @@ namespace OpenGrid.Framework.Data.MySQL
         /// <param name="username">The username logging into the database</param>

         /// <param name="password">The password for the user logging in</param>

         /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>

-        public MySQLManager(string hostname, string database, string username, string password, string cpooling)

+        public MySQLManager(string hostname, string database, string username, string password, string cpooling, string port)

         {

             try

             {

-                string connectionString = "Server=" + hostname + ";Port=3306;Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";";

+                string connectionString = "Server=" + hostname + ";Port=" + port + ";Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";";

                 dbcon = new MySqlConnection(connectionString);

 

                 dbcon.Open();

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
index 0741272..df681eb 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
@@ -12,7 +12,15 @@ namespace OpenGrid.Framework.Data.MySQL
 

         public void Initialise()

         {

-            database = new MySQLManager("host", "database", "user", "password", "false");

+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");

+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");

+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");

+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");

+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");

+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");

+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");

+

+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);

         }

 

         public UserProfileData getUserByName(string name)

diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index 2f47478..b033c6c 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -81,6 +81,9 @@
     <Compile Include="GridData.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="IniConfig.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="SimProfileData.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index c054f8a..281295f 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
@@ -12,6 +12,7 @@
             </resources>

             <sources failonempty="true">

                 <include name="GridData.cs" />

+                <include name="IniConfig.cs" />

                 <include name="SimProfileData.cs" />

                 <include name="UserData.cs" />

                 <include name="UserProfileData.cs" />