[GRASS-SVN] r35663 - grass/branches/develbranch_6/scripts/r.in.wms

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-01-27 21:03:51 -0500 (Tue, 27 Jan 2009)
New Revision: 35663

Modified:
   grass/branches/develbranch_6/scripts/r.in.wms/r.in.wms
   grass/branches/develbranch_6/scripts/r.in.wms/wms.download
Log:
msg cosmetics, check if r.support worked

Modified: grass/branches/develbranch_6/scripts/r.in.wms/r.in.wms
===================================================================
--- grass/branches/develbranch_6/scripts/r.in.wms/r.in.wms	2009-01-27 20:37:54 UTC (rev 35662)
+++ grass/branches/develbranch_6/scripts/r.in.wms/r.in.wms	2009-01-28 02:03:51 UTC (rev 35663)
@@ -561,13 +561,18 @@
 message 1 "r.in.gdalwarp $GDALWARP"
 eval "r.in.gdalwarp $GDALWARP"
 if [ $? -ne 0 ] ; then
+   g.message -e message="r.in.gdalwarp failed"
    exit 1
 fi
 
 r.support map="$GIS_OPT_OUTPUT" title="WMS Download" history="" \
   source1=`echo "$GIS_OPT_MAPSERVER" | cut -c-70` \
   source2=`echo "$GIS_OPT_MAPSERVER" | cut -c71-140`
-  
+if [ $? -ne 0 ] ; then
+   g.message -e message="r.support failed"
+   exit 1
+fi
+
 LAY_LEN="echo "$GIS_OPT_LAYERS" | wc -c"
 
 r.support map="$GIS_OPT_OUTPUT" history="layers: $GIS_OPT_LAYERS"
@@ -582,6 +587,7 @@
 r.support map="$GIS_OPT_OUTPUT" description="generated by r.in.wms" history=""
 r.support map="$GIS_OPT_OUTPUT" history="$CMDLINE"
 
+
 g.message -v message="Map <${GIS_OPT_OUTPUT}> written"
 
 # Clean up:

Modified: grass/branches/develbranch_6/scripts/r.in.wms/wms.download
===================================================================
--- grass/branches/develbranch_6/scripts/r.in.wms/wms.download	2009-01-27 20:37:54 UTC (rev 35662)
+++ grass/branches/develbranch_6/scripts/r.in.wms/wms.download	2009-01-28 02:03:51 UTC (rev 35663)
@@ -155,7 +155,7 @@
 #Get the data from the WMS server
 GetData() {
    g.message "Downloading data"
-   g.message -v message="Requesting Data from <${SERVER}:>"
+   g.message -v message="Requesting Data from <${SERVER}>:"
    g.message -v message="$STRING"
 
    if [ "$POST_DATA_OK" -eq 1 ] ; then