[GRASS-SVN] r51261 - grass/branches/develbranch_6/vector/v.reclass

[svn_grass at osgeo.org]

Author: neteler
Date: 2012-04-04 08:00:42 -0700 (Wed, 04 Apr 2012)
New Revision: 51261

Modified:
   grass/branches/develbranch_6/vector/v.reclass/main.c
Log:
backport of r48333 (v.reclass: fix for #548)

Modified: grass/branches/develbranch_6/vector/v.reclass/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.reclass/main.c	2012-04-04 14:43:43 UTC (rev 51260)
+++ grass/branches/develbranch_6/vector/v.reclass/main.c	2012-04-04 15:00:42 UTC (rev 51261)
@@ -7,7 +7,7 @@
  *               Glynn Clements <glynn gclements.plus.com>,
  *               Jachym Cepicky <jachym les-ejk.cz>, Markus Neteler <neteler itc.it>
  * PURPOSE:      
- * COPYRIGHT:    (C) 1999-2007 by the GRASS Development Team
+ * COPYRIGHT:    (C) 1999-2009 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public
  *               License (>=v2). Read the file COPYING that comes with GRASS
@@ -144,7 +144,7 @@
 	    G_debug(3, "nrec = %d", nrec);
 	}
 	else if (ctype == DB_C_TYPE_STRING) {
-	    int i, more, nrows, newval, len;
+	    int i, more, nrows, ncols, newval, len;
 	    dbString stmt, stmt2;
 	    dbString lastval;
 	    dbCursor cursor;
@@ -167,7 +167,44 @@
 								   database,
 								   &Out));
 
+	    /* get string column length */
+	    db_set_string(&stmt, Fi->table);
+	    if (db_describe_table(Driver, &stmt, &table) != DB_OK) {
+		G_fatal_error(_("Unable to describe table <%s>"), Fi->table);
+	    }
 
+	    column = NULL;
+
+	    ncols = db_get_table_number_of_columns(table);
+	    G_debug(3, "ncol = %d", ncols);
+
+	    len = 0;
+	    for (i = 0; i < ncols; i++) {
+		column = db_get_table_column(table, i);
+		if (G_strcasecmp(db_get_column_name(column), col_opt->answer) == 0) {
+		    /* String column length */
+		    len = db_get_column_length(column);
+		    break;
+		}
+	    }
+	    db_free_table(table);
+
+	    /* Create table */
+	    sprintf(buf, "create table %s (cat integer, %s varchar(%d))",
+		    NewFi->table, col_opt->answer, len);
+
+	    db_set_string(&stmt2, buf);
+
+	    if (db_execute_immediate(Driver2, &stmt2) != DB_OK) {
+		Vect_close(&Out);
+		db_close_database_shutdown_driver(Driver);
+		db_close_database_shutdown_driver(Driver2);
+		G_fatal_error("Unable to create table: '%s'",
+			      db_get_string(&stmt2));
+	    }
+	    db_begin_transaction(Driver2);
+
+	    /* select values */
 	    sprintf(buf, "SELECT %s, %s FROM %s ORDER BY %s", Fi->key,
 		    col_opt->answer, Fi->table, col_opt->answer);
 	    db_set_string(&stmt, buf);
@@ -182,7 +219,7 @@
 	    nrows = db_get_num_rows(&cursor);
 
 	    G_debug(3, "  %d rows selected", nrows);
-	    if (nrows < 0)
+	    if (nrows <= 0)
 		G_fatal_error(_("No records selected from table <%s>"),
 			      Fi->table);
 
@@ -201,34 +238,6 @@
 
 	    cvarr.ctype = DB_C_TYPE_INT;
 
-	    /* String column length */
-	    column = db_get_table_column(table, 1);
-	    len = db_get_column_length(column);
-
-	    /* Create table */
-	    sprintf(buf, "create table %s (cat integer, %s varchar(%d))",
-		    NewFi->table, col_opt->answer, len);
-
-	    db_set_string(&stmt2, buf);
-
-	    if (db_execute_immediate(Driver2, &stmt2) != DB_OK) {
-		Vect_close(&Out);
-		db_close_database_shutdown_driver(Driver);
-		db_close_database_shutdown_driver(Driver2);
-		G_fatal_error("Unable to create table: '%s'",
-			      db_get_string(&stmt2));
-	    }
-
-	    if (db_create_index2(Driver2, NewFi->table, NewFi->key) != DB_OK)
-		G_warning(_("Unable to create index for table <%s>, key <%s>"),
-			  NewFi->table, NewFi->key);
-
-	    if (db_grant_on_table(Driver2, NewFi->table, DB_PRIV_SELECT,
-				  DB_GROUP | DB_PUBLIC) != DB_OK) {
-		G_fatal_error(_("Unable to grant privileges on table <%s>"),
-			      NewFi->table);
-	    }
-
 	    newval = 0;
 
 	    /* fetch the data */
@@ -277,12 +286,23 @@
 
 	    cvarr.n_values = nrows;
 
-	    db_close_database_shutdown_driver(Driver2);
-
 	    db_close_cursor(&cursor);
 	    db_free_string(&stmt);
 	    db_free_string(&lastval);
 
+	    db_commit_transaction(Driver2);
+
+	    if (db_create_index2(Driver2, NewFi->table, NewFi->key) != DB_OK)
+		G_warning(_("Unable to create index for table <%s>, key <%s>"),
+			  NewFi->table, NewFi->key);
+
+	    if (db_grant_on_table(Driver2, NewFi->table, DB_PRIV_SELECT,
+				  DB_GROUP | DB_PUBLIC) != DB_OK) {
+		G_fatal_error(_("Unable to grant privileges on table <%s>"),
+			      NewFi->table);
+	    }
+	    db_close_database_shutdown_driver(Driver2);
+
 	    qsort((void *)cvarr.value, nrows, sizeof(dbCatVal), cmpcat);
 	}
 	else {