r.in.wms: fix get method

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37059 15284696-431f-4ddb-bdfa-cd5b030d7da7

scripts/r.in.wms/r.in.wms.py

@@ -222,17 +222,17 @@ def main():
     if options['region']:
         if not grass.find_file(name = options['region'], element = 'windows')['name']:
             grass.fatal("Region <%s> not found" % options['region'])
-    
+
+    request = wms_request.WMSRequest(flags, options)    
     if not flags['d']:
         # request data first
-        request = wms_request.WMSRequest(flags, options)
         request.GetTiles()
-        if not request:
-            grass.fatal("WMS request failed")
+    if not request:
+        grass.fatal("WMS request failed")
     
     # download data
     download = wms_download.WMSDownload(flags, options)
-    download.GetTiles(request.GetRequests()) ## ??
+    download.GetTiles(request.GetRequests())
     
     # list of files
     files = []

scripts/r.in.wms/wms_download.py

@@ -42,7 +42,7 @@ class WMSDownload:
         """Download data"""
         grass.message("Downloading data (tile %d)..." % idx)
         grass.verbose("Requesting data: %s" % self.options['mapserver'])
-                
+
         if not self.flags['g']: # -> post
             try:
                 urllib.urlretrieve(server, output, data = query)
@@ -60,7 +60,7 @@ class WMSDownload:
             
         if self.flags['g']: # -> get
             try:
-                urllib.urlretrieve(url, output, data="GET")
+                urllib.urlretrieve(server + '?' + query, output, data = None)
             except IOError:
                 grass.fatal("Failed while downloading the data")