[mapguide-commits] r6546 - trunk/Tools/Maestro/MgCooker

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-03-14 23:30:11 -0700 (Wed, 14 Mar 2012)
New Revision: 6546

Modified:
   trunk/Tools/Maestro/MgCooker/MgCooker.csproj
   trunk/Tools/Maestro/MgCooker/Program.cs
   trunk/Tools/Maestro/MgCooker/SetupRun.cs
Log:
#1971: Improve MgCooker handling of Map Definitions:
 - Reference ExtendedObjectModels and call ModelSetup.Initialize() on startup, allowing MgCooker to recognise > 1.0.0 Map Definition versions
 - Do not process and show Map Definitions whose schema versions are not recognised

Modified: trunk/Tools/Maestro/MgCooker/MgCooker.csproj
===================================================================
--- trunk/Tools/Maestro/MgCooker/MgCooker.csproj	2012-03-13 15:15:03 UTC (rev 6545)
+++ trunk/Tools/Maestro/MgCooker/MgCooker.csproj	2012-03-15 06:30:11 UTC (rev 6546)
@@ -136,6 +136,12 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OSGeo.MapGuide.ExtendedObjectModels\OSGeo.MapGuide.ExtendedObjectModels.csproj">
+      <Project>{B3A2B816-9F41-4857-A111-09D2DF2550D6}</Project>
+      <Name>OSGeo.MapGuide.ExtendedObjectModels</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Modified: trunk/Tools/Maestro/MgCooker/Program.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Program.cs	2012-03-13 15:15:03 UTC (rev 6545)
+++ trunk/Tools/Maestro/MgCooker/Program.cs	2012-03-15 06:30:11 UTC (rev 6546)
@@ -26,6 +26,7 @@
 using OSGeo.MapGuide.MaestroAPI;
 using System.Collections.Specialized;
 using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ExtendedObjectModels;
 
 namespace MgCooker
 {
@@ -56,7 +57,7 @@
             System.Windows.Forms.Application.EnableVisualStyles();
             System.Windows.Forms.Application.DoEvents();
             PreferredSiteList.InitCulture();
-
+            ModelSetup.Initialize(); //Ensures that > 1.0.0 Map Definitions are recognised
             //Parameters:
             //mapagent=
             //username=

Modified: trunk/Tools/Maestro/MgCooker/SetupRun.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/SetupRun.cs	2012-03-13 15:15:03 UTC (rev 6545)
+++ trunk/Tools/Maestro/MgCooker/SetupRun.cs	2012-03-15 06:30:11 UTC (rev 6546)
@@ -131,7 +131,10 @@
             MapTree.Nodes.Clear();
             foreach (string m in maps)
             {
-                IMapDefinition mdef = (IMapDefinition)m_connection.ResourceService.GetResource(m);
+                IMapDefinition mdef = m_connection.ResourceService.GetResource(m) as IMapDefinition;
+                if (mdef == null) //Skip unknown Map Definition version (which would be returned as UntypedResource objects)
+                    continue;
+
                 IBaseMapDefinition baseMap = mdef.BaseMap;
                 if (baseMap != null &&
                     baseMap.ScaleCount > 0 &&