[GRASS-SVN] r31591 - grass/trunk/scripts/v.db.join

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-05-31 19:32:16 -0400 (Sat, 31 May 2008)
New Revision: 31591

Modified:
   grass/trunk/scripts/v.db.join/v.db.join
Log:
Revert r31583


Modified: grass/trunk/scripts/v.db.join/v.db.join
===================================================================
--- grass/trunk/scripts/v.db.join/v.db.join	2008-05-30 21:25:43 UTC (rev 31590)
+++ grass/trunk/scripts/v.db.join/v.db.join	2008-05-31 23:32:16 UTC (rev 31591)
@@ -103,14 +103,10 @@
 
 i=1
 for col in $COLLIST ; do
-  # col already there?
-  v.info --quiet -c map="$GIS_OPT_MAP" layer=$GIS_OPT_LAYER | cut -d'|' -f1,2 | grep "|${col}$" 2>&1 >/dev/null
+  v.db.addcol "$GIS_OPT_MAP" col="$col `echo $COLTYPES | cut -d' ' -f$i | tr -s '_' ' '`"
   if [ $? -ne 0 ] ; then
-     v.db.addcol "$GIS_OPT_MAP" col="$col `echo $COLTYPES | cut -d' ' -f$i | tr -s '_' ' '`"
-     if [ $? -ne 0 ] ; then
 	g.message -e "Cannot continue."
 	exit 1
-     fi
   fi
   echo "UPDATE $maptable SET $col=(SELECT $col
         FROM $GIS_OPT_otable WHERE $GIS_OPT_otable.$GIS_OPT_ocolumn=$maptable.$GIS_OPT_column);" | db.execute