Fix wms server format test

mhugent · mhugent · commit b65c463bb2eb · 2013-04-13T12:37:42.000+02:00
diff --git a/src/mapserver/qgshttprequesthandler.cpp b/src/mapserver/qgshttprequesthandler.cpp
@@ -425,11 +425,11 @@ void QgsHttpRequestHandler::requestStringToParameterMap( const QString& request,
       QgsDebugMsg( QString( "formatString is: %1" ).arg( formatString ) );
 
       //remove the image/ in front of the format
-      if ( formatString.contains( "image/png", Qt::CaseInsensitive ) == 0 || formatString.compare( "png", Qt::CaseInsensitive ) == 0 )
+      if ( formatString.contains( "image/png", Qt::CaseInsensitive ) || formatString.compare( "png", Qt::CaseInsensitive ) == 0 )
       {
         formatString = "PNG";
       }
-      else if ( formatString.contains( "image/jpeg", Qt::CaseInsensitive ) == 0 || formatString.contains( "image/jpg", Qt::CaseInsensitive ) == 0
+      else if ( formatString.contains( "image/jpeg", Qt::CaseInsensitive ) || formatString.contains( "image/jpg", Qt::CaseInsensitive )
                 || formatString.compare( "jpg", Qt::CaseInsensitive ) == 0 )
       {
         formatString = "JPG";
@@ -438,7 +438,7 @@ void QgsHttpRequestHandler::requestStringToParameterMap( const QString& request,
       {
         formatString = "SVG";
       }
-      else if ( formatString.contains( "pdf", Qt::CaseInsensitive ) == 0 )
+      else if ( formatString.contains( "pdf", Qt::CaseInsensitive ) )
       {
         formatString = "PDF";
       }

Original file line number	Diff line number	Diff line change
`@@ -425,11 +425,11 @@ void QgsHttpRequestHandler::requestStringToParameterMap( const QString& request,`
`425`	`425`	`QgsDebugMsg( QString( "formatString is: %1" ).arg( formatString ) );`
`426`	`426`
`427`	`427`	`//remove the image/ in front of the format`
`428`		`- if ( formatString.contains( "image/png", Qt::CaseInsensitive ) == 0 \|\| formatString.compare( "png", Qt::CaseInsensitive ) == 0 )`
	`428`	`+ if ( formatString.contains( "image/png", Qt::CaseInsensitive ) \|\| formatString.compare( "png", Qt::CaseInsensitive ) == 0 )`
`429`	`429`	`{`
`430`	`430`	`formatString = "PNG";`
`431`	`431`	`}`
`432`		`- else if ( formatString.contains( "image/jpeg", Qt::CaseInsensitive ) == 0 \|\| formatString.contains( "image/jpg", Qt::CaseInsensitive ) == 0`
	`432`	`+ else if ( formatString.contains( "image/jpeg", Qt::CaseInsensitive ) \|\| formatString.contains( "image/jpg", Qt::CaseInsensitive )`
`433`	`433`	`\|\| formatString.compare( "jpg", Qt::CaseInsensitive ) == 0 )`
`434`	`434`	`{`
`435`	`435`	`formatString = "JPG";`
`@@ -438,7 +438,7 @@ void QgsHttpRequestHandler::requestStringToParameterMap( const QString& request,`
`438`	`438`	`{`
`439`	`439`	`formatString = "SVG";`
`440`	`440`	`}`
`441`		`- else if ( formatString.contains( "pdf", Qt::CaseInsensitive ) == 0 )`
	`441`	`+ else if ( formatString.contains( "pdf", Qt::CaseInsensitive ) )`
`442`	`442`	`{`
`443`	`443`	`formatString = "PDF";`
`444`	`444`	`}`