[GRASS-SVN] r43379 - in grass/branches/releasebranch_6_4/scripts: db.out.ogr g.extension r.fillnulls

[svn_grass at osgeo.org]

Author: neteler
Date: 2010-09-01 12:48:50 +0000 (Wed, 01 Sep 2010)
New Revision: 43379

Modified:
   grass/branches/releasebranch_6_4/scripts/db.out.ogr/db.out.ogr
   grass/branches/releasebranch_6_4/scripts/g.extension/g.extension
   grass/branches/releasebranch_6_4/scripts/r.fillnulls/r.fillnulls
Log:
backport install presence test

Modified: grass/branches/releasebranch_6_4/scripts/db.out.ogr/db.out.ogr
===================================================================
--- grass/branches/releasebranch_6_4/scripts/db.out.ogr/db.out.ogr	2010-09-01 12:45:21 UTC (rev 43378)
+++ grass/branches/releasebranch_6_4/scripts/db.out.ogr/db.out.ogr	2010-09-01 12:48:50 UTC (rev 43379)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 ############################################################################
 #
@@ -101,7 +101,10 @@
   
 v.out.ogr --q $GIS_OPT_INPUT dsn="$GIS_OPT_DSN" $OLAYER format=$GIS_OPT_FORMAT type=point
 if [ $? -ne 0 ] ;  then
-   exit 1
+   g.message -w "Trying ogr2ogr on table"
+   database="`db.connect -p | grep \"^database\" | cut -d':' -f2`"
+   echo $database
+   ogr2ogr -f "$GIS_OPT_FORMAT" "$GIS_OPT_DSN" "$database" `basename $GIS_OPT_DSN`
 fi
 
 if [ "$GIS_OPT_FORMAT" = "ESRI_Shapefile" ] ; then

Modified: grass/branches/releasebranch_6_4/scripts/g.extension/g.extension
===================================================================
--- grass/branches/releasebranch_6_4/scripts/g.extension/g.extension	2010-09-01 12:45:21 UTC (rev 43378)
+++ grass/branches/releasebranch_6_4/scripts/g.extension/g.extension	2010-09-01 12:48:50 UTC (rev 43379)
@@ -84,6 +84,8 @@
 rm -f "$TMPDIR"
 mkdir "$TMPDIR"
 
+#TODO: combine all these checks into a single for loop
+
 # check if we have the svn client
 if [ ! -x "`which svn`" ] ; then
     g.message -e "svn client required. Please install Subversion first."
@@ -92,10 +94,16 @@
 
 # check if we have the make program
 if [ ! -x "`which make`" ] ; then
-    g.message -e "'make' program required. Please install first."
+    g.message -e "The 'make' program is required. Please install first."
     exit 1
 fi
 
+# check if we have the "install" program
+if [ ! -x "`which install`" ] ; then
+    g.message -e "The 'install' program is required. Please install first."
+    exit 1
+fi
+
 # check if we have wget or curl
 if [ ! -x "`which wget`" ] ; then
     if [ ! -x "`which curl`" ] ; then

Modified: grass/branches/releasebranch_6_4/scripts/r.fillnulls/r.fillnulls
===================================================================
--- grass/branches/releasebranch_6_4/scripts/r.fillnulls/r.fillnulls	2010-09-01 12:45:21 UTC (rev 43378)
+++ grass/branches/releasebranch_6_4/scripts/r.fillnulls/r.fillnulls	2010-09-01 12:48:50 UTC (rev 43379)
@@ -207,19 +207,21 @@
 if test -f $LOCATION/cell/$USERMASK
 then
   g.message "Using user mask while interpolating"
-  RST_CMD="v.surf.rst zcol=value tension=$GIS_OPT_TENSION smooth=$GIS_OPT_SMOOTH maskmap=$USERMASK"
+#  RST_CMD="v.surf.rst zcol=value tension=$GIS_OPT_TENSION smooth=$GIS_OPT_SMOOTH maskmap=$USERMASK"
+  RST_CMD="v.surf.bspline colum=value layer=1 sie=800 sin=800 lambda_i=1 method=bicubic"
 else
-  RST_CMD="v.surf.rst zcol=value tension=$GIS_OPT_TENSION smooth=$GIS_OPT_SMOOTH"
+#  RST_CMD="v.surf.rst zcol=value tension=$GIS_OPT_TENSION smooth=$GIS_OPT_SMOOTH"
+  RST_CMD="v.surf.bspline colum=value layer=1 sie=800 sin=800 lambda_i=1 method=bicubic"
 fi
 
 SEGMAX=600
 if [ $POINTSNUMBER  -ge $SEGMAX ] ; then
   g.message "Using segmentation for interpolation..."
-  $RST_CMD input=${VECTTMP} elev=${TMP1}_filled #2> /dev/null
+  $RST_CMD input=${VECTTMP} raster=${TMP1}_filled #2> /dev/null
 else
   #if less than $SEGMAX points, use no segmentation for speedup:
   g.message "Using no segmentation for interpolation as not needed..."
-  $RST_CMD input=${VECTTMP} elev=${TMP1}_filled segmax=$SEGMAX #2> /dev/null
+  $RST_CMD input=${VECTTMP} raster=${TMP1}_filled #segmax=$SEGMAX #2> /dev/null
 fi
 
 g.message "Note: Above warnings may be ignored."