Browse Source

msg cosmetics, check if r.support worked (merge from devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35664 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 16 years ago
parent
commit
d2cf616ba3
2 changed files with 8 additions and 2 deletions
  1. 7 1
      scripts/r.in.wms/r.in.wms
  2. 1 1
      scripts/r.in.wms/wms.download

+ 7 - 1
scripts/r.in.wms/r.in.wms

@@ -561,13 +561,18 @@ fi
 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 @@ fi
 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:

+ 1 - 1
scripts/r.in.wms/wms.download

@@ -155,7 +155,7 @@ GetTiles() {
 #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