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

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat Feb 12 16:27:51 EST 2011


Author: jef
Date: 2011-02-12 13:27:51 -0800 (Sat, 12 Feb 2011)
New Revision: 15162

Modified:
   trunk/qgis/src/mapserver/qgis_map_serv.cpp
   trunk/qgis/src/mapserver/qgsconfigcache.cpp
   trunk/qgis/src/mapserver/qgsgetrequesthandler.cpp
   trunk/qgis/src/mapserver/qgshostedrdsbuilder.cpp
   trunk/qgis/src/mapserver/qgshostedvdsbuilder.cpp
   trunk/qgis/src/mapserver/qgsmapserverlogger.cpp
   trunk/qgis/src/mapserver/qgsmapserverlogger.h
   trunk/qgis/src/mapserver/qgsmslayercache.cpp
   trunk/qgis/src/mapserver/qgsremotedatasourcebuilder.cpp
   trunk/qgis/src/mapserver/qgsremoteowsbuilder.cpp
   trunk/qgis/src/mapserver/qgssentdatasourcebuilder.cpp
   trunk/qgis/src/mapserver/qgssldparser.cpp
   trunk/qgis/src/mapserver/qgssldrule.cpp
   trunk/qgis/src/mapserver/qgssoaprequesthandler.cpp
   trunk/qgis/src/mapserver/qgswmsserver.cpp
Log:
mapserver: semicolon removed from QgsMSDebugMsg macro

Modified: trunk/qgis/src/mapserver/qgis_map_serv.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgis_map_serv.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgis_map_serv.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -72,36 +72,36 @@
 {
 #ifdef QGSMSDEBUG
   //print out some infos about the request
-  QgsMSDebugMsg( "************************new request**********************" )
+  QgsMSDebugMsg( "************************new request**********************" );
   QgsMSDebugMsg( QDateTime::currentDateTime().toString( "yyyy-MM-dd hh:mm:ss" ) );
 
   if ( getenv( "REMOTE_ADDR" ) != NULL )
   {
-    QgsMSDebugMsg( "remote ip: " + QString( getenv( "REMOTE_ADDR" ) ) )
+    QgsMSDebugMsg( "remote ip: " + QString( getenv( "REMOTE_ADDR" ) ) );
   }
   if ( getenv( "REMOTE_HOST" ) != NULL )
   {
-    QgsMSDebugMsg( "remote host: " + QString( getenv( "REMOTE_HOST" ) ) )
+    QgsMSDebugMsg( "remote host: " + QString( getenv( "REMOTE_HOST" ) ) );
   }
   if ( getenv( "REMOTE_USER" ) != NULL )
   {
-    QgsMSDebugMsg( "remote user: " + QString( getenv( "REMOTE_USER" ) ) )
+    QgsMSDebugMsg( "remote user: " + QString( getenv( "REMOTE_USER" ) ) );
   }
   if ( getenv( "REMOTE_IDENT" ) != NULL )
   {
-    QgsMSDebugMsg( "REMOTE_IDENT: " + QString( getenv( "REMOTE_IDENT" ) ) )
+    QgsMSDebugMsg( "REMOTE_IDENT: " + QString( getenv( "REMOTE_IDENT" ) ) );
   }
   if ( getenv( "CONTENT_TYPE" ) != NULL )
   {
-    QgsMSDebugMsg( "CONTENT_TYPE: " + QString( getenv( "CONTENT_TYPE" ) ) )
+    QgsMSDebugMsg( "CONTENT_TYPE: " + QString( getenv( "CONTENT_TYPE" ) ) );
   }
   if ( getenv( "AUTH_TYPE" ) != NULL )
   {
-    QgsMSDebugMsg( "AUTH_TYPE: " + QString( getenv( "AUTH_TYPE" ) ) )
+    QgsMSDebugMsg( "AUTH_TYPE: " + QString( getenv( "AUTH_TYPE" ) ) );
   }
   if ( getenv( "HTTP_USER_AGENT" ) != NULL )
   {
-    QgsMSDebugMsg( "HTTP_USER_AGENT: " + QString( getenv( "HTTP_USER_AGENT" ) ) )
+    QgsMSDebugMsg( "HTTP_USER_AGENT: " + QString( getenv( "HTTP_USER_AGENT" ) ) );
   }
 #endif //QGSMSDEBUG
 }
@@ -154,12 +154,12 @@
   //write to qgis_wms_server.log in application directory
   QgsMapServerLogger::instance()->setLogFilePath( qgsapp.applicationDirPath() + "/qgis_wms_server.log" );
 #endif
-  QgsMSDebugMsg( "Prefix  PATH: " + QgsApplication::prefixPath() )
-  QgsMSDebugMsg( "Plugin  PATH: " + QgsApplication::pluginPath() )
-  QgsMSDebugMsg( "PkgData PATH: " + QgsApplication::pkgDataPath() )
-  QgsMSDebugMsg( "User DB PATH: " + QgsApplication::qgisUserDbFilePath() )
+  QgsMSDebugMsg( "Prefix  PATH: " + QgsApplication::prefixPath() );
+  QgsMSDebugMsg( "Plugin  PATH: " + QgsApplication::pluginPath() );
+  QgsMSDebugMsg( "PkgData PATH: " + QgsApplication::pkgDataPath() );
+  QgsMSDebugMsg( "User DB PATH: " + QgsApplication::qgisUserDbFilePath() );
 
-  QgsMSDebugMsg( qgsapp.applicationDirPath() + "/qgis_wms_server.log" )
+  QgsMSDebugMsg( qgsapp.applicationDirPath() + "/qgis_wms_server.log" );
 
   //create config cache and search for config files in the current directory.
   //These configurations are used if no mapfile parameter is present in the request
@@ -194,18 +194,18 @@
     {
       if ( strcmp( requestMethod, "POST" ) == 0 )
       {
-        QgsMSDebugMsg( "Creating QgsSOAPRequestHandler" )
+        QgsMSDebugMsg( "Creating QgsSOAPRequestHandler" );
         theRequestHandler = new QgsSOAPRequestHandler();
       }
       else
       {
-        QgsMSDebugMsg( "Creating QgsGetRequestHandler" )
+        QgsMSDebugMsg( "Creating QgsGetRequestHandler" );
         theRequestHandler = new QgsGetRequestHandler();
       }
     }
     else
     {
-      QgsMSDebugMsg( "Creating QgsGetRequestHandler" )
+      QgsMSDebugMsg( "Creating QgsGetRequestHandler" );
       theRequestHandler = new QgsGetRequestHandler();
     }
 
@@ -217,7 +217,7 @@
     }
     catch ( QgsMapServiceException& e )
     {
-      QgsMSDebugMsg( "An exception was thrown during input parsing" )
+      QgsMSDebugMsg( "An exception was thrown during input parsing" );
       theRequestHandler->sendServiceException( e );
       continue;
     }
@@ -246,7 +246,7 @@
     if ( serviceIt == parameterMap.end() )
     {
       //tell the user that service parameter is mandatory
-      QgsMSDebugMsg( "unable to find 'SERVICE' parameter, exiting..." )
+      QgsMSDebugMsg( "unable to find 'SERVICE' parameter, exiting..." );
       theRequestHandler->sendServiceException( QgsMapServiceException( "ServiceNotSpecified", "Service not specified. The SERVICE parameter is mandatory" ) );
       delete theRequestHandler;
       continue;
@@ -271,7 +271,7 @@
     if ( requestIt == parameterMap.end() )
     {
       //do some error handling
-      QgsMSDebugMsg( "unable to find 'REQUEST' parameter, exiting..." )
+      QgsMSDebugMsg( "unable to find 'REQUEST' parameter, exiting..." );
       theRequestHandler->sendServiceException( QgsMapServiceException( "OperationNotSupported", "Please check the value of the REQUEST parameter" ) );
       delete theRequestHandler;
       delete theServer;
@@ -292,7 +292,7 @@
         delete theServer;
         continue;
       }
-      QgsMSDebugMsg( "sending GetCapabilities response" )
+      QgsMSDebugMsg( "sending GetCapabilities response" );
       theRequestHandler->sendGetCapabilitiesResponse( capabilitiesDocument );
       delete theRequestHandler;
       delete theServer;
@@ -307,7 +307,7 @@
       }
       catch ( QgsMapServiceException& ex )
       {
-        QgsMSDebugMsg( "Catched exception during GetMap request" )
+        QgsMSDebugMsg( "Catched exception during GetMap request" );
         theRequestHandler->sendServiceException( ex );
         delete theRequestHandler;
         delete theServer;
@@ -316,13 +316,13 @@
 
       if ( result )
       {
-        QgsMSDebugMsg( "Sending GetMap response" )
+        QgsMSDebugMsg( "Sending GetMap response" );
         theRequestHandler->sendGetMapResponse( serviceIt->second, result );
       }
       else
       {
         //do some error handling
-        QgsMSDebugMsg( "result image is 0" )
+        QgsMSDebugMsg( "result image is 0" );
       }
       delete result;
       delete theRequestHandler;
@@ -392,14 +392,14 @@
 
       if ( result )
       {
-        QgsMSDebugMsg( "Sending GetLegendGraphics response" )
+        QgsMSDebugMsg( "Sending GetLegendGraphics response" );
         //sending is the same for GetMap and GetLegendGraphics
         theRequestHandler->sendGetMapResponse( serviceIt->second, result );
       }
       else
       {
         //do some error handling
-        QgsMSDebugMsg( "result image is 0" )
+        QgsMSDebugMsg( "result image is 0" );
       }
       delete result;
       delete theRequestHandler;

Modified: trunk/qgis/src/mapserver/qgsconfigcache.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsconfigcache.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgsconfigcache.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -38,12 +38,12 @@
   QMap<QString, QgsConfigParser*>::const_iterator configIt = mCachedConfigurations.find( filePath );
   if ( configIt == mCachedConfigurations.constEnd() )
   {
-    QgsMSDebugMsg( "Create new configuration" )
+    QgsMSDebugMsg( "Create new configuration" );
     return insertConfiguration( filePath );
   }
   else
   {
-    QgsMSDebugMsg( "Return configuration from cash" )
+    QgsMSDebugMsg( "Return configuration from cache" );
     return configIt.value();
   }
 }

Modified: trunk/qgis/src/mapserver/qgsgetrequesthandler.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsgetrequesthandler.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgsgetrequesthandler.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -24,11 +24,11 @@
   if ( qs )
   {
     queryString = QString( qs );
-    QgsMSDebugMsg( "query string is: " + queryString )
+    QgsMSDebugMsg( "query string is: " + queryString );
   }
   else
   {
-    QgsMSDebugMsg( "error, no query string found" )
+    QgsMSDebugMsg( "error, no query string found" );
     return parameters; //no query string? something must be wrong...
   }
 
@@ -80,7 +80,7 @@
 
     }
     parameters.insert( std::make_pair( key.toUpper(), value ) );
-    QgsMSDebugMsg( "inserting pair " + key.toUpper() + " // " + value + " into the parameter map" )
+    QgsMSDebugMsg( "inserting pair " + key.toUpper() + " // " + value + " into the parameter map" );
   }
 
   //feature info format?
@@ -160,7 +160,7 @@
 void QgsGetRequestHandler::sendGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat ) const
 {
   QByteArray ba;
-  QgsMSDebugMsg( "Info format is:" + infoFormat )
+  QgsMSDebugMsg( "Info format is:" + infoFormat );
 
   if ( infoFormat == "text/xml" )
   {

Modified: trunk/qgis/src/mapserver/qgshostedrdsbuilder.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgshostedrdsbuilder.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgshostedrdsbuilder.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -35,7 +35,7 @@
 
 QgsMapLayer* QgsHostedRDSBuilder::createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching ) const
 {
-  QgsMSDebugMsg( "entering." )
+  QgsMSDebugMsg( "entering." );
 
   if ( elem.isNull() )
   {
@@ -45,12 +45,12 @@
   QString uri = elem.attribute( "uri", "not found" );
   if ( uri == "not found" )
   {
-    QgsMSDebugMsg( "Uri not found" )
+    QgsMSDebugMsg( "Uri not found" );
     return 0;
   }
   else
   {
-    QgsMSDebugMsg( "Trying to get hostedrds layer from cache with uri: " + uri )
+    QgsMSDebugMsg( "Trying to get hostedrds layer from cache with uri: " + uri );
     QgsRasterLayer* rl = 0;
     if ( allowCaching )
     {
@@ -58,7 +58,7 @@
     }
     if ( !rl )
     {
-      QgsMSDebugMsg( "hostedrds layer not in cache, so create and insert it" )
+      QgsMSDebugMsg( "hostedrds layer not in cache, so create and insert it" );
       rl = new QgsRasterLayer( uri, layerNameFromUri( uri ) );
       if ( allowCaching )
       {

Modified: trunk/qgis/src/mapserver/qgshostedvdsbuilder.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgshostedvdsbuilder.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgshostedvdsbuilder.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -44,7 +44,7 @@
 
   if ( providerType == "not found" || uri == "not found" )
   {
-    QgsMSDebugMsg( "error, provider type not found" )
+    QgsMSDebugMsg( "error, provider type not found" );
     return 0;
   }
 
@@ -58,12 +58,12 @@
 
   if ( !ml )
   {
-    QgsMSDebugMsg( "hostedvds layer not in cash, so create and insert it" )
+    QgsMSDebugMsg( "hostedvds layer not in cash, so create and insert it" );
     ml = new QgsVectorLayer( uri, layerNameFromUri( uri ), providerType );
 
     if ( !ml || !ml->isValid() )
     {
-      QgsMSDebugMsg( "error, VectorLayer is 0 or invalid" )
+      QgsMSDebugMsg( "error, VectorLayer is 0 or invalid" );
       delete ml;
       return 0;
     }

Modified: trunk/qgis/src/mapserver/qgsmapserverlogger.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsmapserverlogger.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgsmapserverlogger.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -68,9 +68,9 @@
 void QgsMapServerLogger::printMessage( const char *file, const char *function, int line, const QString& message )
 {
 #if defined(_MSC_VER)
-  printMessage( QString( "%1(%2): (%3) %4" ).arg( file ).arg( line ).arg( function ).arg( line ).arg( message ) );
+  printMessage( QString( "%1(%2): (%3) %4" ).arg( file ).arg( line ).arg( function ).arg( message ) );
 #else
-  printMessage( QString( "%1: %2: (%3) %4" ).arg( file ).arg( line ).arg( function ).arg( line ).arg( message ) );
+  printMessage( QString( "%1: %2: (%3) %4" ).arg( file ).arg( line ).arg( function ).arg( message ) );
 #endif
 }
 #endif

Modified: trunk/qgis/src/mapserver/qgsmapserverlogger.h
===================================================================
--- trunk/qgis/src/mapserver/qgsmapserverlogger.h	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgsmapserverlogger.h	2011-02-12 21:27:51 UTC (rev 15162)
@@ -22,7 +22,7 @@
 #include <QTextStream>
 
 #ifdef QGSMSDEBUG
-#define QgsMSDebugMsg(str) QgsMapServerLogger::instance()->printMessage(__FILE__, __FUNCTION__, __LINE__, str);
+#define QgsMSDebugMsg(str) QgsMapServerLogger::instance()->printMessage(__FILE__, __FUNCTION__, __LINE__, str)
 #else
 #define QgsMSDebugMsg(str)
 #endif

Modified: trunk/qgis/src/mapserver/qgsmslayercache.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsmslayercache.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgsmslayercache.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -39,7 +39,7 @@
 
 QgsMSLayerCache::~QgsMSLayerCache()
 {
-  QgsMSDebugMsg( "removing all entries" )
+  QgsMSDebugMsg( "removing all entries" );
   QMap<QPair<QString, QString>, QgsMSLayerCacheEntry>::iterator it;
   for ( it = mEntries.begin(); it != mEntries.end(); ++it )
   {
@@ -50,7 +50,7 @@
 
 void QgsMSLayerCache::insertLayer( const QString& url, const QString& layerName, QgsMapLayer* layer, const QList<QString>& tempFiles )
 {
-  QgsMSDebugMsg( "inserting layer" )
+  QgsMSDebugMsg( "inserting layer" );
   if ( mEntries.size() > MAX_N_LAYERS ) //force cache layer examination after 10 inserted layers
   {
     updateEntries();
@@ -79,7 +79,7 @@
   QMap<QPair<QString, QString>, QgsMSLayerCacheEntry>::iterator it = mEntries.find( urlNamePair );
   if ( it == mEntries.end() )
   {
-    QgsMSDebugMsg( "Layer not found in cache" )
+    QgsMSDebugMsg( "Layer not found in cache" );
     return 0;
   }
   else
@@ -93,14 +93,14 @@
       vl->removeOverlay( "diagram" );
     }
 #endif //DIAGRAMSERVER
-    QgsMSDebugMsg( "Layer found in cache" )
+    QgsMSDebugMsg( "Layer found in cache" );
     return it->layerPointer;
   }
 }
 
 void QgsMSLayerCache::updateEntries()
 {
-  QgsMSDebugMsg( "updateEntries" )
+  QgsMSDebugMsg( "updateEntries" );
   int entriesToDelete = mEntries.size() - MAX_N_LAYERS;
   if ( entriesToDelete < 1 )
   {
@@ -120,7 +120,7 @@
   {
     return;
   }
-  QgsMSDebugMsg( "removeLeastUsedEntry" )
+  QgsMSDebugMsg( "removeLeastUsedEntry" );
   QMap<QPair<QString, QString>, QgsMSLayerCacheEntry>::iterator it = mEntries.begin();
   QMap<QPair<QString, QString>, QgsMSLayerCacheEntry>::iterator lowest_it = it;
   time_t lowest_time = it->lastUsedTime;
@@ -149,10 +149,8 @@
     QFile removeFile( *it );
     if ( !removeFile.remove() )
     {
-      QgsMSDebugMsg( "could not remove file: " + *it )
-      QgsMSDebugMsg( removeFile.errorString() )
+      QgsMSDebugMsg( "could not remove file: " + *it );
+      QgsMSDebugMsg( removeFile.errorString() );
     }
   }
 }
-
-

Modified: trunk/qgis/src/mapserver/qgsremotedatasourcebuilder.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsremotedatasourcebuilder.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgsremotedatasourcebuilder.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -155,7 +155,7 @@
     QgsHttpTransaction http( url );
     if ( !http.getSynchronously( data ) )
     {
-      QgsMSDebugMsg( "Error, loading from http failed" )
+      QgsMSDebugMsg( "Error, loading from http failed" );
       return 1; //no success
     }
   }

Modified: trunk/qgis/src/mapserver/qgsremoteowsbuilder.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsremoteowsbuilder.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgsremoteowsbuilder.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -50,7 +50,7 @@
   QDomNode serviceNode = elem.namedItem( "Service" );
   if ( serviceNode.isNull() )
   {
-    QgsMSDebugMsg( "No <Service> node found, returning 0" )
+    QgsMSDebugMsg( "No <Service> node found, returning 0" );
     return 0; //service node is necessary
   }
 
@@ -58,7 +58,7 @@
   QDomNode onlineResourceNode = elem.namedItem( "OnlineResource" );
   if ( onlineResourceNode.isNull() )
   {
-    QgsMSDebugMsg( "No <OnlineResource> element, returning 0" )
+    QgsMSDebugMsg( "No <OnlineResource> element, returning 0" );
     return 0;
   }
 
@@ -122,7 +122,7 @@
   }
   else if ( serviceName == "WCS" )
   {
-    QgsMSDebugMsg( "Trying to get WCS layer" )
+    QgsMSDebugMsg( "Trying to get WCS layer" );
     result = wcsLayerFromUrl( url, layerName, filesToRemove, layersToRemove );
   }
   else if ( serviceName == "SOS" )
@@ -132,7 +132,7 @@
 
   if ( !result || !result->isValid() )
   {
-    QgsMSDebugMsg( "Error, maplayer is 0 or invalid" )
+    QgsMSDebugMsg( "Error, maplayer is 0 or invalid" );
     if ( result )
     {
       delete result;
@@ -145,7 +145,7 @@
 
 QgsRasterLayer* QgsRemoteOWSBuilder::wmsLayerFromUrl( const QString& url, const QString& layerName, QList<QgsMapLayer*>& layersToRemove, bool allowCaching ) const
 {
-  QgsMSDebugMsg( "Entering" )
+  QgsMSDebugMsg( "Entering" );
   QgsRasterLayer* result = 0;
   QString baseUrl, format, crs;
   QStringList layerList, styleList;
@@ -193,11 +193,11 @@
     }
   }
 
-  QgsMSDebugMsg( "baseUrl: " + baseUrl )
-  QgsMSDebugMsg( "format: " + format )
-  QgsMSDebugMsg( "crs: " + crs )
-  QgsMSDebugMsg( "layerList first item: " + layerList.at( 0 ) )
-  QgsMSDebugMsg( "styleList first item: " + styleList.at( 0 ) )
+  QgsMSDebugMsg( "baseUrl: " + baseUrl );
+  QgsMSDebugMsg( "format: " + format );
+  QgsMSDebugMsg( "crs: " + crs );
+  QgsMSDebugMsg( "layerList first item: " + layerList.at( 0 ) );
+  QgsMSDebugMsg( "styleList first item: " + styleList.at( 0 ) );
 
   result = new QgsRasterLayer( 0, baseUrl, "", "wms", layerList, styleList, format, crs );
   if ( !result->isValid() )
@@ -219,7 +219,7 @@
 
 QgsRasterLayer* QgsRemoteOWSBuilder::wcsLayerFromUrl( const QString& url, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching ) const
 {
-  QgsMSDebugMsg( "Entering" )
+  QgsMSDebugMsg( "Entering" );
 
   //write server url and coverage name to a temporary file
   QString fileName = createTempFile();
@@ -239,13 +239,13 @@
 
   filesToRemove.push_back( tmpFile ); //make sure the temporary file gets deleted after each request
 
-  QgsMSDebugMsg( "opening successful" )
-  QgsMSDebugMsg( "url: " + url )
+  QgsMSDebugMsg( "opening successful" );
+  QgsMSDebugMsg( "url: " + url );
   //extract server url and coverage name from string
   QStringList serverSplit = url.split( "?" );
   if ( serverSplit.size() < 2 )
   {
-    QgsMSDebugMsg( "error, no '?' contained in url" )
+    QgsMSDebugMsg( "error, no '?' contained in url" );
     return 0;
   }
   QString serverUrl = serverSplit.at( 0 );
@@ -267,7 +267,7 @@
 
   if ( coverageName.isEmpty() )
   {
-    QgsMSDebugMsg( "coverage name is empty" )
+    QgsMSDebugMsg( "coverage name is empty" );
     return 0;
   }
 
@@ -276,8 +276,8 @@
     format = "GeoTIFF"; //use geotiff as default
   }
 
-  QgsMSDebugMsg( "wcs server url: " + serverUrl )
-  QgsMSDebugMsg( "coverage name: " + coverageName )
+  QgsMSDebugMsg( "wcs server url: " + serverUrl );
+  QgsMSDebugMsg( "coverage name: " + coverageName );
 
   //fetch WCS layer in the current resolution as geotiff
   QString wcsRequest = serverUrl + "?SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&COVERAGE=" + coverageName + "&FORMAT=" + format;
@@ -289,7 +289,7 @@
     crsIt = mParameterMap.find( "SRS" );
     if ( crsIt == mParameterMap.end() )
     {
-      QgsMSDebugMsg( "No CRS or SRS parameter found for wcs layer, returning 0" )
+      QgsMSDebugMsg( "No CRS or SRS parameter found for wcs layer, returning 0" );
       return 0;
     }
   }
@@ -300,7 +300,7 @@
   std::map<QString, QString>::const_iterator widthIt = mParameterMap.find( "WIDTH" );
   if ( widthIt == mParameterMap.end() )
   {
-    QgsMSDebugMsg( "No WIDTH parameter found for wcs layer, returning 0" )
+    QgsMSDebugMsg( "No WIDTH parameter found for wcs layer, returning 0" );
     return 0;
   }
   wcsRequest += "&WIDTH=";
@@ -310,7 +310,7 @@
   std::map<QString, QString>::const_iterator heightIt = mParameterMap.find( "HEIGHT" );
   if ( heightIt == mParameterMap.end() )
   {
-    QgsMSDebugMsg( "No HEIGHT parameter found for wcs layer, returning 0" )
+    QgsMSDebugMsg( "No HEIGHT parameter found for wcs layer, returning 0" );
     return 0;
   }
   wcsRequest += "&HEIGHT=";
@@ -320,13 +320,13 @@
   std::map<QString, QString>::const_iterator bboxIt = mParameterMap.find( "BBOX" );
   if ( bboxIt == mParameterMap.end() )
   {
-    QgsMSDebugMsg( "No BBOX parameter found for wcs layer, returning 0" )
+    QgsMSDebugMsg( "No BBOX parameter found for wcs layer, returning 0" );
     return 0;
   }
   wcsRequest += "&BBOX=";
   wcsRequest += bboxIt->second;
 
-  QgsMSDebugMsg( "WCS request is: " + wcsRequest )
+  QgsMSDebugMsg( "WCS request is: " + wcsRequest );
 
   //make request and store byte array into temporary file
   QgsHttpTransaction httpTransaction( wcsRequest );

Modified: trunk/qgis/src/mapserver/qgssentdatasourcebuilder.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgssentdatasourcebuilder.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgssentdatasourcebuilder.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -66,10 +66,10 @@
     QgsVectorLayer* theVectorLayer = new QgsVectorLayer( tmpFile->fileName(), layerNameFromUri( tmpFile->fileName() ), "WFS" );
     if ( !theVectorLayer || !theVectorLayer->isValid() )
     {
-      QgsMSDebugMsg( "invalid maplayer" )
+      QgsMSDebugMsg( "invalid maplayer" );
       return 0;
     }
-    QgsMSDebugMsg( "returning maplayer" )
+    QgsMSDebugMsg( "returning maplayer" );
 
     layersToRemove.push_back( theVectorLayer ); //make sure the layer gets deleted after each request
 
@@ -84,7 +84,7 @@
 
 QgsRasterLayer* QgsSentDataSourceBuilder::rasterLayerFromSentRDS( const QDomElement& sentRDSElem, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove ) const
 {
-  QgsMSDebugMsg( "Entering" )
+  QgsMSDebugMsg( "Entering" );
   QString tempFilePath = createTempFile();
   if ( tempFilePath.isEmpty() )
   {
@@ -125,7 +125,7 @@
     }
   }
 
-  QgsMSDebugMsg( "TempFilePath is: " + tempFilePath )
+  QgsMSDebugMsg( "TempFilePath is: " + tempFilePath );
   tmpFile->close();
 
   QgsRasterLayer* rl = new QgsRasterLayer( tmpFile->fileName(), layerNameFromUri( tmpFile->fileName() ) );

Modified: trunk/qgis/src/mapserver/qgssldparser.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgssldparser.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgssldparser.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -196,7 +196,7 @@
         QList<QgsMapLayer*> layerList = mapLayerFromStyle( nameList.item( 0 ).toElement().text(), "" );
         if ( layerList.size() < 1 )//error while generating the layer
         {
-          QgsMSDebugMsg( "Error, no maplayer in layer list" )
+          QgsMSDebugMsg( "Error, no maplayer in layer list" );
           continue;
         }
 
@@ -204,7 +204,7 @@
         QgsMapLayer* theMapLayer = layerList.at( 0 );
         if ( !theMapLayer )//error while generating the layer
         {
-          QgsMSDebugMsg( "Error, QgsMapLayer object is 0" )
+          QgsMSDebugMsg( "Error, QgsMapLayer object is 0" );
           continue;
         }
 
@@ -346,17 +346,17 @@
     QgsRasterLayer* theRasterLayer = dynamic_cast<QgsRasterLayer*>( theMapLayer );
     if ( theRasterLayer )
     {
-      QgsMSDebugMsg( "Layer is a rasterLayer" )
+      QgsMSDebugMsg( "Layer is a rasterLayer" );
       if ( !userStyleElement.isNull() )
       {
-        QgsMSDebugMsg( "Trying to add raster symbology" )
+        QgsMSDebugMsg( "Trying to add raster symbology" );
         rasterSymbologyFromUserStyle( userStyleElement, theRasterLayer );
         //todo: possibility to have vector layer or raster layer
-        QgsMSDebugMsg( "Trying to find contour symbolizer" )
+        QgsMSDebugMsg( "Trying to find contour symbolizer" );
         QgsVectorLayer* v = contourLayerFromRaster( userStyleElement, theRasterLayer );
         if ( v )
         {
-          QgsMSDebugMsg( "Returning vector layer" )
+          QgsMSDebugMsg( "Returning vector layer" );
           resultList.push_back( v );
           mLayersToRemove.push_back( v );
         }
@@ -382,25 +382,25 @@
   }
   else
   {
-    QgsMSDebugMsg( "Trying to get a renderer from the user style" )
+    QgsMSDebugMsg( "Trying to get a renderer from the user style" );
     theRenderer = rendererFromUserStyle( userStyleElement, theVectorLayer );
     //apply labels if <TextSymbolizer> tag is present
     labelSettingsFromUserStyle( userStyleElement, theVectorLayer );
 #ifdef DIAGRAMSERVER
     //apply any vector overlays
-    QgsMSDebugMsg( "Trying to get overlays from user style" )
+    QgsMSDebugMsg( "Trying to get overlays from user style" );
     overlaysFromUserStyle( userStyleElement, theVectorLayer );
 #endif //DIAGRAMSERVER
   }
 
   if ( !theRenderer )
   {
-    QgsMSDebugMsg( "Error, could not create a renderer" )
+    QgsMSDebugMsg( "Error, could not create a renderer" );
     delete theVectorLayer;
     return resultList;
   }
   theVectorLayer->setRenderer( theRenderer );
-  QgsMSDebugMsg( "Returning the vectorlayer" )
+  QgsMSDebugMsg( "Returning the vectorlayer" );
   setOpacityForLayer( userLayerElement, theVectorLayer );
   resultList.push_back( theVectorLayer );
   return resultList;
@@ -413,7 +413,7 @@
     return 0;
   }
 
-  QgsMSDebugMsg( "Entering" )
+  QgsMSDebugMsg( "Entering" );
 
   QgsSLDRenderer* theRenderer = new QgsSLDRenderer( vec->geometryType() );
   theRenderer->setScaleDenominator( mScaleDenominator );
@@ -444,7 +444,7 @@
 
 bool QgsSLDParser::rasterSymbologyFromUserStyle( const QDomElement& userStyleElement, QgsRasterLayer* r ) const
 {
-  QgsMSDebugMsg( "Entering" )
+  QgsMSDebugMsg( "Entering" );
   if ( !r )
   {
     return false;
@@ -505,7 +505,7 @@
     myNewColorRampItem.color = QColor( red, green, blue );
     QString value = currentColorMapEntryElem.attribute( "quantity" );
     myNewColorRampItem.value = value.toDouble();
-    QgsMSDebugMsg( "Adding colormap entry" )
+    QgsMSDebugMsg( "Adding colormap entry" );
     colorRampItems.push_back( myNewColorRampItem );
   }
 
@@ -522,7 +522,7 @@
     myRasterShaderFunction->setColorRampType( QgsColorRampShader::DISCRETE );
   }
 
-  //QgsMSDebugMsg("Setting drawing style")
+  //QgsMSDebugMsg("Setting drawing style");
   r->setDrawingStyle( QgsRasterLayer::SingleBandPseudoColor );
 
   //set pseudo color mode
@@ -602,7 +602,7 @@
                     QDomNodeList cssNodes = labelFontElementList.item( 0 ).toElement().elementsByTagName( "CssParameter" );
                     QString cssName;
                     QDomElement currentElement;
-                    QgsMSDebugMsg( "Number of Css Properties: " + QString::number( cssNodes.size() ) )
+                    QgsMSDebugMsg( "Number of Css Properties: " + QString::number( cssNodes.size() ) );
                     for ( int i = 0; i < cssNodes.size(); ++i )
                     {
                       currentElement = cssNodes.item( i ).toElement();
@@ -614,22 +614,22 @@
 
                       //switch depending on attribute 'name'
                       cssName = currentElement.attribute( "name", "not_found" );
-                      QgsMSDebugMsg( "property " + QString::number( i ) + ": " + cssName  + " " + elemText )
+                      QgsMSDebugMsg( "property " + QString::number( i ) + ": " + cssName  + " " + elemText );
                       if ( cssName != "not_found" )
                       {
                         if ( cssName == "font-family" )
                         {
-                          QgsMSDebugMsg( cssName + " " + elemText )
+                          QgsMSDebugMsg( cssName + " " + elemText );
                           fontfamily = elemText;
                         }
                         else if ( cssName == "font-style" )
                         {
-                          QgsMSDebugMsg( cssName + " " + elemText )
+                          QgsMSDebugMsg( cssName + " " + elemText );
                           fontstyle = elemText;
                         }
                         else if ( cssName == "font-size" )
                         {
-                          QgsMSDebugMsg( cssName + " " + elemText )
+                          QgsMSDebugMsg( cssName + " " + elemText );
                           success = false;
                           fontsize = elemText.toInt( &success );
                           if ( !success )
@@ -640,12 +640,12 @@
                         }
                         else if ( cssName == "font-weight" )
                         {
-                          QgsMSDebugMsg( cssName + " " + elemText )
+                          QgsMSDebugMsg( cssName + " " + elemText );
                           fontweight = elemText;
                         }
                         else if ( cssName == "font-underline" )
                         {
-                          QgsMSDebugMsg( cssName + " " + elemText )
+                          QgsMSDebugMsg( cssName + " " + elemText );
                           fontunderline = elemText;
                         }
                       }
@@ -661,7 +661,7 @@
                     QDomNodeList cssNodes = labelFillElementList.item( 0 ).toElement().elementsByTagName( "CssParameter" );
                     QString cssName;
                     QDomElement currentElement;
-                    QgsMSDebugMsg( "Number of Css Properties: " + QString::number( cssNodes.size() ) )
+                    QgsMSDebugMsg( "Number of Css Properties: " + QString::number( cssNodes.size() ) );
                     for ( int i = 0; i < cssNodes.size(); ++i )
                     {
                       currentElement = cssNodes.item( i ).toElement();
@@ -673,12 +673,12 @@
 
                       //switch depending on attribute 'name'
                       cssName = currentElement.attribute( "name", "not_found" );
-                      QgsMSDebugMsg( "property " + QString::number( i ) + ": " + cssName  + " " + elemText )
+                      QgsMSDebugMsg( "property " + QString::number( i ) + ": " + cssName  + " " + elemText );
                       if ( cssName != "not_found" )
                       {
                         if ( cssName == "fill" )
                         {
-                          QgsMSDebugMsg( cssName + " " + elemText )
+                          QgsMSDebugMsg( cssName + " " + elemText );
                           //accept input in the form of #ff0000
                           if ( elemText.length() == 7 )
                           {
@@ -702,7 +702,7 @@
                         }
                         else if ( cssName == "fill-opacity" )
                         {
-                          QgsMSDebugMsg( cssName + " " + elemText )
+                          QgsMSDebugMsg( cssName + " " + elemText );
                           bool success;
                           double op = elemText.toDouble( &success );
                           if ( success )
@@ -754,7 +754,7 @@
                     QDomNodeList cssNodes = labelBufferElementList.item( 0 ).toElement().elementsByTagName( "CssParameter" );
                     QString cssName;
                     QDomElement currentElement;
-                    QgsMSDebugMsg( "Number of Css Properties: " + QString::number( cssNodes.size() ) )
+                    QgsMSDebugMsg( "Number of Css Properties: " + QString::number( cssNodes.size() ) );
                     for ( int i = 0; i < cssNodes.size(); ++i )
                     {
                       currentElement = cssNodes.item( i ).toElement();
@@ -766,12 +766,12 @@
 
                       //switch depending on attribute 'name'
                       cssName = currentElement.attribute( "name", "not_found" );
-                      QgsMSDebugMsg( "property " + QString::number( i ) + ": " + cssName  + " " + elemText )
+                      QgsMSDebugMsg( "property " + QString::number( i ) + ": " + cssName  + " " + elemText );
                       if ( cssName != "not_found" )
                       {
                         if ( cssName == "fill" )
                         {
-                          QgsMSDebugMsg( cssName + " " + elemText )
+                          QgsMSDebugMsg( cssName + " " + elemText );
                           //accept input in the form of #ff0000
                           if ( elemText.length() == 7 )
                           {
@@ -795,7 +795,7 @@
                         }
                         else if ( cssName == "fill-opacity" )
                         {
-                          QgsMSDebugMsg( cssName + " " + elemText )
+                          QgsMSDebugMsg( cssName + " " + elemText );
                           bool success;
                           double op = elemText.toDouble( &success );
                           if ( success )
@@ -866,7 +866,7 @@
                         displacementY = 0.0;
                       }
                     }
-                    QgsMSDebugMsg( "rotationAngle " + QString::number( rotationAngle ) )
+                    QgsMSDebugMsg( "rotationAngle " + QString::number( rotationAngle ) );
 
                     myLabelAttributes->setOffset( displacementX, displacementY, QgsLabelAttributes::PointUnits );
                     myLabelAttributes->setAngle( rotationAngle );
@@ -985,7 +985,7 @@
 
 int QgsSLDParser::layersAndStyles( QStringList& layers, QStringList& styles ) const
 {
-  QgsMSDebugMsg( "Entering." )
+  QgsMSDebugMsg( "Entering." );
   layers.clear();
   styles.clear();
 
@@ -1001,7 +1001,7 @@
         QDomElement currentLayerElement = layerNodes.item( i ).toElement();
         if ( currentLayerElement.localName() == "NamedLayer" )
         {
-          QgsMSDebugMsg( "Found a NamedLayer" )
+          QgsMSDebugMsg( "Found a NamedLayer" );
           //layer name
           QDomNodeList nameList = currentLayerElement.elementsByTagName/*NS*/( /*mSLDNamespace,*/ "Name" );
           if ( nameList.length() < 1 )
@@ -1020,7 +1020,7 @@
               continue; //a layer name is mandatory
             }
             QString styleName = styleNameList.item( 0 ).toElement().text();
-            QgsMSDebugMsg( "styleName is: " + styleName )
+            QgsMSDebugMsg( "styleName is: " + styleName );
             layers.push_back( layerName );
             styles.push_back( styleName );
           }
@@ -1035,23 +1035,23 @@
               continue; //a layer name is mandatory
             }
             QString styleName = styleNameList.item( 0 ).toElement().text();
-            QgsMSDebugMsg( "styleName is: " + styleName )
+            QgsMSDebugMsg( "styleName is: " + styleName );
             layers.push_back( layerName );
             styles.push_back( styleName );
           }
         }
         else if ( currentLayerElement.localName() == "UserLayer" )
         {
-          QgsMSDebugMsg( "Found a UserLayer" )
+          QgsMSDebugMsg( "Found a UserLayer" );
           //layer name
           QDomNodeList nameList = currentLayerElement.elementsByTagName/*NS*/( /*mSLDNamespace,*/ "Name" );
           if ( nameList.length() < 1 )
           {
-            QgsMSDebugMsg( "Namelist size is <1" )
+            QgsMSDebugMsg( "Namelist size is <1" );
             continue; //a layer name is mandatory
           }
           QString layerName = nameList.item( 0 ).toElement().text();
-          QgsMSDebugMsg( "layerName is: " + layerName )
+          QgsMSDebugMsg( "layerName is: " + layerName );
           //find the User Styles and the corresponding names
           QDomNodeList userStyleList = currentLayerElement.elementsByTagName/*NS*/( /*mSLDNamespace,*/ "UserStyle" );
           for ( int j = 0; j < userStyleList.size(); ++j )
@@ -1059,12 +1059,12 @@
             QDomNodeList styleNameList = userStyleList.item( j ).toElement().elementsByTagName/*NS*/( /*mSLDNamespace,*/ "Name" );
             if ( styleNameList.size() < 1 )
             {
-              QgsMSDebugMsg( "Namelist size is <1" )
+              QgsMSDebugMsg( "Namelist size is <1" );
               continue;
             }
 
             QString styleName = styleNameList.item( 0 ).toElement().text();
-            QgsMSDebugMsg( "styleName is: " + styleName )
+            QgsMSDebugMsg( "styleName is: " + styleName );
             layers.push_back( layerName );
             styles.push_back( styleName );
           }
@@ -1081,7 +1081,7 @@
 
 QgsMapLayer* QgsSLDParser::mapLayerFromUserLayer( const QDomElement& userLayerElem, const QString& layerName, bool allowCaching ) const
 {
-  QgsMSDebugMsg( "Entering." )
+  QgsMSDebugMsg( "Entering." );
   QgsMSLayerBuilder* layerBuilder = 0;
   QDomElement builderRootElement;
 
@@ -1173,7 +1173,7 @@
 
     if ( gmlIt != mExternalGMLDatasets.end() )
     {
-      QgsMSDebugMsg( "Trying to get maplayer from external GML" )
+      QgsMSDebugMsg( "Trying to get maplayer from external GML" );
       theMapLayer = vectorLayerFromGML( gmlIt.value()->documentElement() );
     }
   }
@@ -1197,7 +1197,7 @@
 
 QgsVectorLayer* QgsSLDParser::vectorLayerFromGML( const QDomElement gmlRootElement ) const
 {
-  QgsMSDebugMsg( "Entering." )
+  QgsMSDebugMsg( "Entering." );
 
   //QString tempFilePath = QgsMSUtils::createTempFilePath();
   //QFile tempFile(tempFilePath);
@@ -1218,10 +1218,10 @@
   QgsVectorLayer* theVectorLayer = new QgsVectorLayer( tmpFile->fileName(), layerNameFromUri( tmpFile->fileName() ), "WFS" );
   if ( !theVectorLayer || !theVectorLayer->isValid() )
   {
-    QgsMSDebugMsg( "invalid maplayer" )
+    QgsMSDebugMsg( "invalid maplayer" );
     return 0;
   }
-  QgsMSDebugMsg( "returning maplayer" )
+  QgsMSDebugMsg( "returning maplayer" );
 
   mLayersToRemove.push_back( theVectorLayer ); //make sure the layer gets deleted after each request
 
@@ -1230,7 +1230,7 @@
 
 QgsVectorLayer* QgsSLDParser::contourLayerFromRaster( const QDomElement& userStyleElem, QgsRasterLayer* rasterLayer ) const
 {
-  QgsMSDebugMsg( "Entering." )
+  QgsMSDebugMsg( "Entering." );
 
   if ( !rasterLayer )
   {
@@ -1408,7 +1408,7 @@
   //add labelling if requested
   labelSettingsFromUserStyle( userStyleElem, contourLayer );
 
-  QgsMSDebugMsg( "Returning the contour layer" )
+  QgsMSDebugMsg( "Returning the contour layer" );
   return contourLayer;
 }
 
@@ -1491,7 +1491,7 @@
     opacityValue = 0;
   }
 
-  QgsMSDebugMsg( "Setting opacity value: " + QString::number( opacityValue ) )
+  QgsMSDebugMsg( "Setting opacity value: " + QString::number( opacityValue ) );
   layer->setTransparency( opacityValue );
 }
 
@@ -1797,7 +1797,7 @@
 
   if ( ! valueNodeList.size() == ( thresholdNodeList.size() + 1 ) )
   {
-    QgsMSDebugMsg( "error, sizes of value and threshold lists do not match" )
+    QgsMSDebugMsg( "error, sizes of value and threshold lists do not match" );
     return 3;
   }
 

Modified: trunk/qgis/src/mapserver/qgssldrule.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgssldrule.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgssldrule.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -547,7 +547,7 @@
 
 int QgsSLDRule::brushFromSvgPattern( const QDomElement& svgPatternElement, QBrush& brush ) const
 {
-  QgsMSDebugMsg( "Entering QgsSLDRule::brushFromSvgPattern" )
+  QgsMSDebugMsg( "Entering QgsSLDRule::brushFromSvgPattern" );
 
   if ( svgPatternElement.isNull() )
   {
@@ -579,7 +579,7 @@
   svgElem.appendChild( svgDocument.importNode( svgGroupElem, true ) );
 
   //debug
-  QgsMSDebugMsg( svgDocument.toString() )
+  QgsMSDebugMsg( svgDocument.toString() );
 
   if ( !renderer.load( svgDocument.toByteArray() ) )
   {

Modified: trunk/qgis/src/mapserver/qgssoaprequesthandler.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgssoaprequesthandler.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgssoaprequesthandler.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -53,7 +53,7 @@
     bool conversionSuccess = false;
     lengthQString = QString( lengthString );
     length = lengthQString.toInt( &conversionSuccess );
-    QgsMSDebugMsg( "length is: " + lengthQString )
+    QgsMSDebugMsg( "length is: " + lengthQString );
     if ( conversionSuccess )
     {
       input = ( char* )malloc( length + 1 );
@@ -76,13 +76,13 @@
       }
       else
       {
-        QgsMSDebugMsg( "input is NULL " )
+        QgsMSDebugMsg( "input is NULL " );
       }
       free( input );
     }
     else
     {
-      QgsMSDebugMsg( "could not convert CONTENT_LENGTH to int" )
+      QgsMSDebugMsg( "could not convert CONTENT_LENGTH to int" );
     }
   }
 
@@ -93,10 +93,10 @@
   QString errorMsg;
   if ( !inputXML.setContent( inputString, true, &errorMsg ) )
   {
-    QgsMSDebugMsg( "soap request parse error" )
-    QgsMSDebugMsg( "error message: " + errorMsg )
-    QgsMSDebugMsg( "the xml string was:" )
-    QgsMSDebugMsg( inputString )
+    QgsMSDebugMsg( "soap request parse error" );
+    QgsMSDebugMsg( "error message: " + errorMsg );
+    QgsMSDebugMsg( "the xml string was:" );
+    QgsMSDebugMsg( inputString );
     throw QgsMapServiceException( "InvalidXML", "XML error: " + errorMsg );
     return result;
   }
@@ -114,7 +114,7 @@
   QDomNodeList envelopeNodeList = inputXML.elementsByTagNameNS( "http://schemas.xmlsoap.org/soap/envelope/", "Envelope" );
   if ( envelopeNodeList.size() < 1 )
   {
-    QgsMSDebugMsg( "Envelope element not found" )
+    QgsMSDebugMsg( "Envelope element not found" );
     throw QgsMapServiceException( "SOAPError", "Element <Envelope> not found" );
     return result;
   }
@@ -122,7 +122,7 @@
   QDomNodeList bodyNodeList = envelopeNodeList.item( 0 ).toElement().elementsByTagNameNS( "http://schemas.xmlsoap.org/soap/envelope/", "Body" );
   if ( bodyNodeList.size() < 1 )
   {
-    QgsMSDebugMsg( "body node not found" )
+    QgsMSDebugMsg( "body node not found" );
     throw QgsMapServiceException( "SOAPError", "Element <Body> not found" );
     return result;
   }
@@ -132,7 +132,7 @@
   QString serviceString = firstChildElement.attribute( "service" );
   if ( serviceString == "MS" )
   {
-    QgsMSDebugMsg( "service = MS " )
+    QgsMSDebugMsg( "service = MS " );
     result.insert( std::make_pair( "SERVICE", "MS" ) );
     mService = "MS";
   }
@@ -279,7 +279,7 @@
         if ( !common.open( QIODevice::ReadOnly ) )
         {
           //throw an exception...
-          QgsMSDebugMsg( "external orchestra common capabilities not found" )
+          QgsMSDebugMsg( "external orchestra common capabilities not found" );
         }
         else
         {
@@ -353,7 +353,7 @@
         if ( !wmsService.open( QIODevice::ReadOnly ) )
         {
           //throw an exception...
-          QgsMSDebugMsg( "external wms service capabilities not found" )
+          QgsMSDebugMsg( "external wms service capabilities not found" );
         }
         else
         {
@@ -363,7 +363,7 @@
           if ( !externServiceDoc.setContent( &wmsService, false, &parseError, &errorLineNo ) )
           {
             QgsMSDebugMsg( "parse error at setting content of external wms service capabilities: "
-                           + parseError + " at line " + QString::number( errorLineNo ) )
+                           + parseError + " at line " + QString::number( errorLineNo ) );
             wmsService.close();
           }
           wmsService.close();
@@ -400,7 +400,7 @@
         if ( !common.open( QIODevice::ReadOnly ) )
         {
           //throw an exception...
-          QgsMSDebugMsg( "external orchestra common capabilities not found" )
+          QgsMSDebugMsg( "external orchestra common capabilities not found" );
         }
         else
         {
@@ -410,7 +410,7 @@
           if ( !externCapDoc.setContent( &common, false, &parseError, &errorLineNo ) )
           {
             QgsMSDebugMsg( "parse error at setting content of external orchestra common capabilities: "
-                           + parseError + " at line " + QString::number( errorLineNo ) )
+                           + parseError + " at line " + QString::number( errorLineNo ) );
             common.close();
           }
           common.close();
@@ -705,7 +705,7 @@
 
 int QgsSOAPRequestHandler::sendSOAPWithAttachments( QImage* img ) const
 {
-  QgsMSDebugMsg( "Entering." )
+  QgsMSDebugMsg( "Entering." );
   //create response xml document
   QDomDocument xmlResponse; //response xml, save this into mimeString
   QDomElement envelopeElement = xmlResponse.createElementNS( "http://schemas.xmlsoap.org/soap/envelope/", "Envelope" );
@@ -763,7 +763,7 @@
   QFile theFile;
   QDir tmpDir;
 
-  QgsMSDebugMsg( "Entering." )
+  QgsMSDebugMsg( "Entering." );
 
   if ( findOutHostAddress( uri ) != 0 )
   {
@@ -780,7 +780,7 @@
   tmpDir = QDir( "/tmp" );
 #endif
 
-  QgsMSDebugMsg( "Path to tmpDir is: " + tmpDir.absolutePath() )
+  QgsMSDebugMsg( "Path to tmpDir is: " + tmpDir.absolutePath() );
 
   //create a random folder under /tmp with map.jpg/png in it
   //and return the link to the client
@@ -789,7 +789,7 @@
   QString folderName = QString::number( randomNumber );
   if ( !QFile::exists( tmpDir.absolutePath() + "/mas_tmp" ) )
   {
-    QgsMSDebugMsg( "Trying to create mas_tmp folder" )
+    QgsMSDebugMsg( "Trying to create mas_tmp folder" );
     if ( !tmpDir.mkdir( "mas_tmp" ) )
     {
       return 2;
@@ -798,11 +798,11 @@
   QDir tmpMasDir( tmpDir.absolutePath() + "/mas_tmp" );
   if ( !tmpMasDir.mkdir( folderName ) )
   {
-    QgsMSDebugMsg( "Trying to create random folder" )
+    QgsMSDebugMsg( "Trying to create random folder" );
     return 3;
   }
 
-  QgsMSDebugMsg( "Temp. folder is: " + tmpMasDir.absolutePath() + "/" + folderName )
+  QgsMSDebugMsg( "Temp. folder is: " + tmpMasDir.absolutePath() + "/" + folderName );
 
   if ( mFormat == "JPG" )
   {
@@ -816,13 +816,13 @@
   }
   if ( !theFile.open( QIODevice::WriteOnly ) )
   {
-    QgsMSDebugMsg( "Error, could not open file" )
+    QgsMSDebugMsg( "Error, could not open file" );
     return 4;
   }
 
   if ( !img->save( &theFile, mFormat.toLocal8Bit().data(), -1 ) )
   {
-    QgsMSDebugMsg( "Error, could not save image" )
+    QgsMSDebugMsg( "Error, could not save image" );
     return 5;
   }
 
@@ -865,7 +865,7 @@
     return 3;
   }
   address = onlineResourceList.at( 0 ).toElement().attribute( "href" );
-  QgsMSDebugMsg( "address found: " + address )
+  QgsMSDebugMsg( "address found: " + address );
   if ( address.isEmpty() )
   {
     return 4;

Modified: trunk/qgis/src/mapserver/qgswmsserver.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgswmsserver.cpp	2011-02-12 21:25:43 UTC (rev 15161)
+++ trunk/qgis/src/mapserver/qgswmsserver.cpp	2011-02-12 21:27:51 UTC (rev 15162)
@@ -68,7 +68,7 @@
 
 QDomDocument QgsWMSServer::getCapabilities()
 {
-  QgsMSDebugMsg( "Entering." )
+  QgsMSDebugMsg( "Entering." );
   QDomDocument doc;
   //wms:WMS_Capabilities element
   QDomElement wmsCapabilitiesElement = doc.createElement( "WMS_Capabilities"/*wms:WMS_Capabilities*/ );
@@ -203,12 +203,12 @@
   }
 
   //add the xml content for the individual layers/styles
-  QgsMSDebugMsg( "calling layersAndStylesCapabilities" )
+  QgsMSDebugMsg( "calling layersAndStylesCapabilities" );
   if ( mConfigParser )
   {
     mConfigParser->layersAndStylesCapabilities( capabilityElement, doc );
   }
-  QgsMSDebugMsg( "layersAndStylesCapabilities returned" )
+  QgsMSDebugMsg( "layersAndStylesCapabilities returned" );
 
   //for debugging: save the document to disk
   /*QFile capabilitiesFile( QDir::tempPath() + "/capabilities.txt" );
@@ -231,7 +231,7 @@
 
   if ( readLayersAndStyles( layersList, stylesList ) != 0 )
   {
-    QgsMSDebugMsg( "error reading layers and styles" )
+    QgsMSDebugMsg( "error reading layers and styles" );
     return 0;
   }
 
@@ -620,7 +620,7 @@
     {
       continue;
     }
-    QgsMSDebugMsg( "Info point in layer crs: " + QString::number( infoPoint.x() ) + "//" + QString::number( infoPoint.y() ) )
+    QgsMSDebugMsg( "Info point in layer crs: " + QString::number( infoPoint.x() ) + "//" + QString::number( infoPoint.y() ) );
 
     QDomElement layerElement = result.createElement( "Layer" );
     layerElement.setAttribute( "name", currentLayer->name() );
@@ -674,19 +674,19 @@
 {
   if ( !mConfigParser )
   {
-    QgsMSDebugMsg( "Error: mSLDParser is 0" )
+    QgsMSDebugMsg( "Error: mSLDParser is 0" );
     return 0;
   }
 
   if ( !mMapRenderer )
   {
-    QgsMSDebugMsg( "Error: mMapRenderer is 0" )
+    QgsMSDebugMsg( "Error: mMapRenderer is 0" );
     return 0;
   }
 
   if ( readLayersAndStyles( layersList, stylesList ) != 0 )
   {
-    QgsMSDebugMsg( "error reading layers and styles" )
+    QgsMSDebugMsg( "error reading layers and styles" );
     return 0;
   }
 
@@ -703,12 +703,12 @@
     if ( gmlDoc->setContent( gmlIt->second, true ) )
     {
       QString layerName = gmlDoc->documentElement().attribute( "layerName" );
-      QgsMSDebugMsg( "Adding entry with key: " + layerName + " to external GML data" )
+      QgsMSDebugMsg( "Adding entry with key: " + layerName + " to external GML data" );
       mConfigParser->addExternalGMLData( layerName, gmlDoc );
     }
     else
     {
-      QgsMSDebugMsg( "Error, could not add external GML to QgsSLDParser" )
+      QgsMSDebugMsg( "Error, could not add external GML to QgsSLDParser" );
       delete gmlDoc;
     }
   }
@@ -894,7 +894,7 @@
   else
   {
     //enable on the fly projection
-    QgsMSDebugMsg( "enable on the fly projection" )
+    QgsMSDebugMsg( "enable on the fly projection" );
     QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectionsEnabled", 1 );
 
     QString crsString = crsIt->second;
@@ -912,7 +912,7 @@
     outputCRS = QgsEPSGCache::instance()->searchCRS( epsgId );
     if ( !outputCRS.isValid() )
     {
-      QgsMSDebugMsg( "Error, could not create output CRS from EPSG" )
+      QgsMSDebugMsg( "Error, could not create output CRS from EPSG" );
       throw QgsMapServiceException( "InvalidCRS", "Could not create output CRS" );
       return 5;
     }
@@ -1002,7 +1002,7 @@
     QStringList stylesSTDList;
     if ( mConfigParser->layersAndStyles( layersSTDList, stylesSTDList ) != 0 )
     {
-      QgsMSDebugMsg( "Error, no layers and styles found in SLD" )
+      QgsMSDebugMsg( "Error, no layers and styles found in SLD" );
       return 0;
     }
     QStringList::const_iterator layersIt;
@@ -1156,7 +1156,7 @@
     {
       styleName = *slstIt;
     }
-    QgsMSDebugMsg( "Trying to get layer " + *llstIt + "//" + styleName )
+    QgsMSDebugMsg( "Trying to get layer " + *llstIt + "//" + styleName );
 
     //does the layer name appear several times in the layer list?
     //if yes, layer caching must be disabled because several named layers could have



More information about the QGIS-commit mailing list