[QGIS Commit] r15082 - trunk/qgis/src/mapserver

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-01-26 01:10:23 -0800 (Wed, 26 Jan 2011)
New Revision: 15082

Modified:
   trunk/qgis/src/mapserver/qgsprojectparser.cpp
Log:
Add element to group composer templates in WMS capabilities

Modified: trunk/qgis/src/mapserver/qgsprojectparser.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsprojectparser.cpp	2011-01-25 22:26:17 UTC (rev 15081)
+++ trunk/qgis/src/mapserver/qgsprojectparser.cpp	2011-01-26 09:10:23 UTC (rev 15082)
@@ -951,6 +951,16 @@
   }
 
   QDomNodeList composerNodeList = mXMLDoc->elementsByTagName( "Composer" );
+  if ( composerNodeList.size() < 1 )
+  {
+    return;
+  }
+
+  QDomElement composerTemplatesElem = doc.createElement( "ComposerTemplates" );
+  composerTemplatesElem.setAttribute( "xmlns:wms", "http://www.opengis.net/wms" );
+  composerTemplatesElem.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
+  composerTemplatesElem.setAttribute( "xsi:type", "wms:_ExtendedCapabilities" );
+
   for ( int i = 0; i < composerNodeList.size(); ++i )
   {
     QDomElement composerTemplateElem = doc.createElement( "ComposerTemplate" );
@@ -961,9 +971,6 @@
     }
 
     composerTemplateElem.setAttribute( "name", currentComposerElem.attribute( "title" ) );
-    composerTemplateElem.setAttribute( "xmlns:wms", "http://www.opengis.net/wms" );
-    composerTemplateElem.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
-    composerTemplateElem.setAttribute( "xsi:type", "wms:_ExtendedCapabilities" );
 
     //get paper width and hight in mm from composition
     QDomElement compositionElem = currentComposerElem.firstChildElement( "Composition" );
@@ -1008,8 +1015,9 @@
       composerTemplateElem.appendChild( composerLabelElem );
     }
 
-    parentElement.appendChild( composerTemplateElem );
+    composerTemplatesElem.appendChild( composerTemplateElem );
   }
+  parentElement.appendChild( composerTemplatesElem );
 }
 
 QDomElement QgsProjectParser::composerByName( const QString& composerName ) const