[GRASS-SVN] r33384 - grass/trunk/scripts/r.in.wms

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-09-10 09:16:08 -0400 (Wed, 10 Sep 2008)
New Revision: 33384

Modified:
   grass/trunk/scripts/r.in.wms/r.in.wms
   grass/trunk/scripts/r.in.wms/wms.download
Log:
bugfix: missing ?; check if r.in.gdalwarp worked (merge from devbr6)

Modified: grass/trunk/scripts/r.in.wms/r.in.wms
===================================================================
--- grass/trunk/scripts/r.in.wms/r.in.wms	2008-09-10 13:07:54 UTC (rev 33383)
+++ grass/trunk/scripts/r.in.wms/r.in.wms	2008-09-10 13:16:08 UTC (rev 33384)
@@ -368,13 +368,13 @@
 	if  [ "$GIS_FLAG_G" -eq 1 ] ; then
 	    g.message -v message=""
 	    if [ "$USE_WGET" ] ; then
-		wget $GIS_OPT_WGETOPTIONS "${GIS_OPT_MAPSERVER}${STRING}" \
+		wget $GIS_OPT_WGETOPTIONS "${GIS_OPT_MAPSERVER}?${STRING}" \
 		  -O "$CAPABILITIES_FILE";
-		message 1 "wget $GIS_OPT_WGETOPTIONS \"${GIS_OPT_MAPSERVER}${STRING}\" -O \"$CAPABILITIES_FILE\";"
+		message 1 "wget $GIS_OPT_WGETOPTIONS \"${GIS_OPT_MAPSERVER}?${STRING}\" -O \"$CAPABILITIES_FILE\";"
 	    else
 		curl $GIS_OPT_CURLOPTIONS -o "$CAPABILITIES_FILE" \
-		  "${GIS_OPT_MAPSERVER}${STRING}"
-		message 1 "curl $GIS_OPT_CURLOPTIONS -o \"$CAPABILITIES_FILE\" \"${GIS_OPT_MAPSERVER}${STRING}\""
+		  "${GIS_OPT_MAPSERVER}?${STRING}"
+		message 1 "curl $GIS_OPT_CURLOPTIONS -o \"$CAPABILITIES_FILE\" \"${GIS_OPT_MAPSERVER}?${STRING}\""
 	    fi
 	    g.message -v message=""
 	fi
@@ -560,6 +560,9 @@
 
 message 1 "r.in.gdalwarp $GDALWARP"
 eval "r.in.gdalwarp $GDALWARP"
+if [ $? -ne 0 ] ; then
+   exit 1
+fi
 
 r.support map="$GIS_OPT_OUTPUT" title="WMS Download" history="" \
   source1=`echo "$GIS_OPT_MAPSERVER" | cut -c-70` \

Modified: grass/trunk/scripts/r.in.wms/wms.download
===================================================================
--- grass/trunk/scripts/r.in.wms/wms.download	2008-09-10 13:07:54 UTC (rev 33383)
+++ grass/trunk/scripts/r.in.wms/wms.download	2008-09-10 13:16:08 UTC (rev 33384)
@@ -185,9 +185,9 @@
    if [ "$POST_DATA_OK" -eq 0 ] ; then
       g.message -v message=""
       if [ "$USE_WGET" ] ; then
-	 wget ${WGET_OPTIONS} "${SERVER}${STRING}" -O "${OUTPUT_FILE}"
+	 wget ${WGET_OPTIONS} "${SERVER}?${STRING}" -O "${OUTPUT_FILE}"
       else
-	 curl ${CURL_OPTIONS} -o "${OUTPUT_FILE}" "${SERVER}${STRING}"
+	 curl ${CURL_OPTIONS} -o "${OUTPUT_FILE}" "${SERVER}?${STRING}"
       fi
       if [ $? -ne 0 ] ; then
          g.message -e "Failed while downloading the data"