[mapguide-commits] r6976 - trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-09-03 06:27:42 -0700 (Mon, 03 Sep 2012)
New Revision: 6976

Modified:
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
Log:
#2035: Fix crash when adding rasters for a top-level aliased folder

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs	2012-09-03 13:08:34 UTC (rev 6975)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs	2012-09-03 13:27:42 UTC (rev 6976)
@@ -274,7 +274,11 @@
                 string dir = null;
                 if (isAlias)
                 {
-                    dir = add.Substring(0, add.LastIndexOf("/"));
+                    int idx = add.LastIndexOf("/");
+                    if (idx >= 0)
+                        dir = add.Substring(0, idx);
+                    else
+                        dir = add.Substring(0, add.LastIndexOf("%") + 1);
                 }
                 else
                 {
@@ -293,10 +297,20 @@
 
                 var scList = fs.GetSpatialInfo(false);
                 
-                var raster = new GdalRasterItem()
+                var raster = new GdalRasterItem();
+
+                if (isAlias)
                 {
-                    FileName = isAlias ? add.Substring(add.LastIndexOf("/") + 1) : Path.GetFileName(add)
-                };
+                    int idx = add.LastIndexOf("/");
+                    if (idx >= 0)
+                        raster.FileName = add.Substring(add.LastIndexOf("/") + 1);
+                    else
+                        raster.FileName = add.Substring(add.LastIndexOf("%"));
+                }
+                else
+                {
+                    raster.FileName = Path.GetFileName(add);
+                }
 
                 if (scList.SpatialContext.Count > 0)
                 {