Contact person and organisation are mandatory in wms capabilities schema

qgis · Jul 19, 2011 · 071f7e1 · 071f7e1
1 parent 707ab4e
commit 071f7e1
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -1304,30 +1304,30 @@ void QgsProjectParser::serviceCapabilities( QDomElement& parentElement, QDomDocu
 
   //Contact person
   QDomElement contactPersonElem = propertiesElem.firstChildElement( "WMSContactPerson" );
+  QString contactPersonString;
   if ( !contactPersonElem.isNull() )
   {
-    QDomElement wmsContactPersonElem = doc.createElement( "ContactPerson" );
-    QDomText contactPersonText = doc.createTextNode( contactPersonElem.text() );
-    wmsContactPersonElem.appendChild( contactPersonText );
-    contactPersonPrimaryElem.appendChild( wmsContactPersonElem );
+    contactPersonString = contactPersonElem.text();
   }
+  QDomElement wmsContactPersonElem = doc.createElement( "ContactPerson" );
+  QDomText contactPersonText = doc.createTextNode( contactPersonString );
+  wmsContactPersonElem.appendChild( contactPersonText );
+  contactPersonPrimaryElem.appendChild( wmsContactPersonElem );
+
 
   //Contact organisation
-  QDomElement contactOrganisationElem = propertiesElem.firstChildElement( "WMSContactOrganisation" );
-  if ( !contactOrganisationElem.isNull() )
+  QDomElement contactOrganizationElem = propertiesElem.firstChildElement( "WMSContactOrganization" );
+  QString contactOrganizationString;
+  if ( !contactOrganizationElem.isNull() )
   {
-    QDomElement wmsContactOrganisationElem = doc.createElement( "ContactOrganization" );
-    QDomText contactOrganisationText = doc.createTextNode( contactOrganisationElem.text() );
-    wmsContactOrganisationElem.appendChild( contactOrganisationText );
-    contactPersonPrimaryElem.appendChild( wmsContactOrganisationElem );
+    contactOrganizationString = contactOrganizationElem.text();
   }
-
+  QDomElement wmsContactOrganizationElem = doc.createElement( "ContactOrganization" );
+  QDomText contactOrganizationText = doc.createTextNode( contactOrganizationString );
+  wmsContactOrganizationElem.appendChild( contactOrganizationText );
+  contactPersonPrimaryElem.appendChild( wmsContactOrganizationElem );
   contactInfoElem.appendChild( contactPersonPrimaryElem );
 
-  //Contact address
-  //QDomElement contactAddressElem = doc.createElement( "ContactAddress" );
-  //contactInfoElem.appendChild( contactAddressElem );
-
   //phone
   QDomElement phoneElem = propertiesElem.firstChildElement( "WMSContactPhone" );
   if ( !phoneElem.isNull() )