[GRASS-SVN] r51259 - grass/branches/releasebranch_6_4/scripts/v.dissolve

[svn_grass at osgeo.org]

Author: neteler
Date: 2012-04-04 07:43:35 -0700 (Wed, 04 Apr 2012)
New Revision: 51259

Modified:
   grass/branches/releasebranch_6_4/scripts/v.dissolve/v.dissolve
Log:
backport of r51246

Modified: grass/branches/releasebranch_6_4/scripts/v.dissolve/v.dissolve
===================================================================
--- grass/branches/releasebranch_6_4/scripts/v.dissolve/v.dissolve	2012-04-04 12:43:27 UTC (rev 51258)
+++ grass/branches/releasebranch_6_4/scripts/v.dissolve/v.dissolve	2012-04-04 14:43:35 UTC (rev 51259)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 ############################################################################
 #
 # MODULE:       v.dissolve
@@ -97,7 +97,7 @@
 else
 
     COLTYPE=`v.info -c "$GIS_OPT_INPUT" layer=$GIS_OPT_LAYER --quiet | grep ".*|$GIS_OPT_COLUMN$" | cut -f1 -d'|'`
-    if [ "$COLTYPE" != "INTEGER" ] && [ "$COLTYPE" != "CHARACTER" ] ; then
+    if [ "$COLTYPE" != "INTEGER" ] && [ "$COLTYPE" != "SMALLINT" ] && [ "$COLTYPE" != "CHARACTER" ] && [ "$COLTYPE" != "TEXT" ] ; then
        g.message -e "Key column must be of type integer or string"
        exit 1
     fi