[mapguide-commits] r7880 - trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-09-30 05:33:02 -0700 (Mon, 30 Sep 2013)
New Revision: 7880

Modified:
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
Log:
#2351: Fix certain resource id elements in Load Procedure documents not being re-mapped when packaging with custom restore paths.

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs	2013-09-30 12:11:33 UTC (rev 7879)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs	2013-09-30 12:33:02 UTC (rev 7880)
@@ -644,7 +644,8 @@
                         if (nx.NodeType == System.Xml.XmlNodeType.Element)
                             lst.Enqueue(nx);
 
-                    if (n.Name == "ResourceId") //NOXLATE
+                    //Anything not "ResourceId" is from the LoadProcedure
+                    if (n.Name == "ResourceId" || n.Name == "SpatialDataSourcesPath" || n.Name == "LayersPath" || n.Name == "RootPath" || n.Name == "MapsPath" || n.Name == "SymbolLibrariesPath") //NOXLATE
                     {
                         string current = n.InnerXml;
                         if (folderupdates && current.StartsWith(oldresourcepath))
@@ -654,7 +655,9 @@
                     }
 
                     foreach (System.Xml.XmlAttribute a in n.Attributes)
-                        if (a.Name == "ResourceId") //NOXLATE
+                    {
+                        //Anything not "ResourceId" is from the LoadProcedure
+                        if (a.Name == "ResourceId" || n.Name == "SpatialDataSourcesPath" || n.Name == "LayersPath" || n.Name == "RootPath" || n.Name == "MapsPath" || n.Name == "SymbolLibrariesPath") //NOXLATE
                         {
                             string current = a.Value;
                             if (folderupdates && current.StartsWith(oldresourcepath))
@@ -662,6 +665,7 @@
                             else if (current == oldresourcepath)
                                 n.Value = newresourcepath;
                         }
+                    }
                 }
 
                 //There can be no objects in an xml document or node, so just return immediately