[mapguide-commits] r7391 - in trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc: . SubEditors

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-03-03 22:41:29 -0800 (Sun, 03 Mar 2013)
New Revision: 7391

Modified:
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
Log:
ODBC Editor: Set 64-bit driver flag in UI if we find a 64-bit driver name in the Feature Source connection string

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs	2013-02-22 22:08:08 UTC (rev 7390)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs	2013-03-04 06:41:29 UTC (rev 7391)
@@ -95,6 +95,9 @@
                 //See if it is file-basd
                 if (odbcStr.Contains("Dbq=")) //NOXLATE
                 {
+                    //Check driver bitness
+                    chkUse64Bit.Checked = OdbcDriverNames.Uses64BitDriver(odbcStr);
+
                     if (odbcStr.Contains("%MG_DATA_FILE_PATH%")) //NOXLATE
                     {
                         cmbMethod.SelectedItem = OdbcConnectionMethod.ManagedFile;
@@ -367,6 +370,8 @@
 
         private void chkUse64Bit_CheckedChanged(object sender, EventArgs e)
         {
+            if (_init) return;
+
             OdbcConnectionMethod method = (OdbcConnectionMethod)cmbMethod.SelectedItem;
             if (method == OdbcConnectionMethod.ManagedFile || method == OdbcConnectionMethod.Unmanaged)
             {

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs	2013-02-22 22:08:08 UTC (rev 7390)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs	2013-03-04 06:41:29 UTC (rev 7391)
@@ -166,5 +166,11 @@
         public const string OdbcDriverAccess64 = "{Microsoft Access Driver (*.mdb, *.accdb)}";
         public const string OdbcDriverExcel = "{Microsoft Excel Driver (*.xls)}";
         public const string OdbcDriverExcel64 = "{Microsoft Excel Driver (*.xls, *.xlsx, *.xlsm, *.xlsb)}";
+
+        internal static bool Uses64BitDriver(string odbcConnStr)
+        {
+            return odbcConnStr.Contains(OdbcDriverNames.OdbcDriverAccess64) ||
+                   odbcConnStr.Contains(OdbcDriverNames.OdbcDriverExcel64);
+        }
     }
 }