[GRASS-SVN] r52482 - grass-addons/grass6/raster/r.in.wms2

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-07-31 04:00:22 -0700 (Tue, 31 Jul 2012)
New Revision: 52482

Modified:
   grass-addons/grass6/raster/r.in.wms2/r.in.wms2.py
Log:
r.in.wms2: no 'suppress_required' available in GRASS 6


Modified: grass-addons/grass6/raster/r.in.wms2/r.in.wms2.py
===================================================================
--- grass-addons/grass6/raster/r.in.wms2/r.in.wms2.py	2012-07-31 10:55:48 UTC (rev 52481)
+++ grass-addons/grass6/raster/r.in.wms2/r.in.wms2.py	2012-07-31 11:00:22 UTC (rev 52482)
@@ -31,7 +31,7 @@
 #% type: string
 #% description: Layers to request from map server
 #% multiple: yes
-#% required: yes
+#% required: no
 #%end
 
 #%option 
@@ -39,7 +39,7 @@
 #% type: string
 #% gisprompt: new,cell,raster
 #% description: Name for output raster map
-#% required: yes
+#% required: no
 #%end
 
 #%option
@@ -131,7 +131,6 @@
 #% key: c
 #% description: Get capabilities
 #% guisection: Request properties
-#% suppress_required: yes
 #%end
 
 #%flag
@@ -158,6 +157,11 @@
     if flags['c']:
         wms.GetCapabilities(options)
     else:
+        if not options['layers']:
+            grass.fatal(_("Required parameter <%s> not set") % 'layers')
+        if not options['output']:
+            grass.fatal(_("Required parameter <%s> not set") % 'output')
+        
         wms.GetMap(options, flags)  
     
     return 0