[GRASS-SVN] r55222 - grass/branches/develbranch_6/scripts/v.db.reconnect.all

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-02-25 15:28:21 -0800 (Mon, 25 Feb 2013)
New Revision: 55222

Modified:
   grass/branches/develbranch_6/scripts/v.db.reconnect.all/v.db.reconnect.all
Log:
better handle spaces in GISDBASE (#1683)

Modified: grass/branches/develbranch_6/scripts/v.db.reconnect.all/v.db.reconnect.all
===================================================================
--- grass/branches/develbranch_6/scripts/v.db.reconnect.all/v.db.reconnect.all	2013-02-25 23:19:59 UTC (rev 55221)
+++ grass/branches/develbranch_6/scripts/v.db.reconnect.all/v.db.reconnect.all	2013-02-25 23:28:21 UTC (rev 55222)
@@ -47,14 +47,11 @@
     exit 1
 fi
 
-eval `g.gisenv`
-: ${GISBASE?} ${GISDBASE?} ${LOCATION_NAME?} ${MAPSET?}
-LOCATION="$GISDBASE/$LOCATION_NAME/$MAPSET"
-
 if [ "$1" != "@ARGS_PARSED@" ] ; then
    exec g.parser "$0" "$@"
 fi
 
+
 OLD_DATABASE="$GIS_OPT_OLD_DATABASE"
 NEW_DATABASE="$GIS_OPT_NEW_DATABASE"
 OLD_SCHEMA="$GIS_OPT_OLD_SCHEMA"
@@ -70,10 +67,13 @@
   exit 1
 fi
 
+
+MAPSET=`g.gisenv get=MAPSET`
+
 for VECT in `g.list type=vect mapset="$MAPSET" | sed 1,2d | grep -v '^-*$'`
 do
-    g.message message="Reconnecting vector '${VECT}@${MAPSET}'"
-    for LINK in `v.db.connect -g fs="|" map=${VECT}@${MAPSET}` ; do
+    g.message message="Reconnecting vector <$VECT> in mapset <$MAPSET>"
+    for LINK in `v.db.connect -g fs="|" map="$VECT@$MAPSET"` ; do
         eval `echo "$LINK" | sed 's$\([^\|]*\)|\([^\|]*\)|\([^\|]*\)|\([^\|]*\)|\([^\|]*\)$LAYER=\1 SCHEMA_TABLE=\2 KEY=\3 DATABASE=\4 DRIVER=\5$'`
 
         SCHEMA=`echo "$SCHEMA_TABLE" | grep '\.' | sed 's/\([^.]*\)\..*/\1/'`