[mapguide-commits] r7526 - branches/maestro-4.0.x/MgCooker

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-05-27 05:01:53 -0700 (Mon, 27 May 2013)
New Revision: 7526

Modified:
   branches/maestro-4.0.x/MgCooker/Program.cs
Log:
#2277: Fix MgCooker command-line ignoring basegroup parameter. Patch by dcreado

Modified: branches/maestro-4.0.x/MgCooker/Program.cs
===================================================================
--- branches/maestro-4.0.x/MgCooker/Program.cs	2013-05-27 12:00:08 UTC (rev 7525)
+++ branches/maestro-4.0.x/MgCooker/Program.cs	2013-05-27 12:01:53 UTC (rev 7526)
@@ -211,21 +211,6 @@
 
             BatchSettings bx = new BatchSettings(connection);
             
-            if (!string.IsNullOrEmpty(basegroups))
-            {
-                List<string> groups = new List<string>();
-                foreach (string s in basegroups.Split(','))
-                {
-                    string f = s;
-                    if (f.StartsWith("\""))
-                        f = f.Substring(1);
-                    if (f.EndsWith("\""))
-                        f = f.Substring(0, f.Length - 1);
-                    groups.Add(f);
-                }
-                bx.SetGroups(groups.ToArray());
-            }
-
             int x;
 
             if (!string.IsNullOrEmpty(limitCols) && int.TryParse(limitCols, out x))
@@ -256,6 +241,22 @@
 
             bx.AddMapDefinitions(maps);
 
+            //basegroups must be set in each mapdefinition 
+            if (!string.IsNullOrEmpty(basegroups))
+            {
+                List<string> groups = new List<string>();
+                foreach (string s in basegroups.Split(','))
+                {
+                    string f = s;
+                    if (f.StartsWith("\""))
+                        f = f.Substring(1);
+                    if (f.EndsWith("\""))
+                        f = f.Substring(0, f.Length - 1);
+                    groups.Add(f);
+                }
+                bx.SetGroups(groups.ToArray());
+            }
+
             if (!string.IsNullOrEmpty(scaleindex))
             {
                 List<int> scales = new List<int>();