From 6a05b2159b84e1c5a462c9c466b0f586fbd47e83 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 May 2005 17:51:17 +0000
Subject: [PATCH] BUGFIX in attribute names unicity enforcement

git-svn-id: http://svn.osgeo.org/postgis/branches/pgis_1_0@1711 b70326c6-7e19-0410-871a-916f4a2858ee
---
 loader/pgsql2shp.c | 64 ++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/loader/pgsql2shp.c b/loader/pgsql2shp.c
index 38848a39a..1a05c03a6 100644
--- a/loader/pgsql2shp.c
+++ b/loader/pgsql2shp.c
@@ -2370,7 +2370,6 @@ get_postgis_major_version(void)
 		exit(1);
 	}
 
-	res = PQexec(conn, query);
 	version = PQgetvalue(res, 0, 0);
 	ver = atoi(version);
 	PQclear(res);
@@ -2395,6 +2394,8 @@ initialize(void)
 	int mainscan_nflds=0;
 	int size;
 	int gidfound=0;
+	char *dbf_flds[256];
+	int dbf_nfields=0;
 
 	/* Detect postgis version */
 	pgis_major_version = get_postgis_major_version();
@@ -2504,7 +2505,7 @@ initialize(void)
 			 * This is exactly the geometry privided
 			 * by the user.
 			 */
-			else if (!strcmp(geo_col_name,fname))
+			else if (!strcmp(geo_col_name, fname))
 			{
 				geom_fld = mainscan_nflds;
 				type_ary[mainscan_nflds]=9; 
@@ -2538,47 +2539,38 @@ initialize(void)
 		 * becomes __xmin when escaped
 		 */
 
+		/* Limit dbf field name to 10-digits */
+		strncpy(field_name, ptr, 10);
+		field_name[10] = 0;
 
-		if(strlen(ptr) <32) strcpy(field_name, ptr);
-		else
+		/* 
+		 * make sure the fields all have unique names,
+		 */
+		tmpint=1;
+		for(j=0; j<dbf_nfields; j++)
 		{
-			/*
-			 * TODO: you find an appropriate name if
-			 * running in RAW mode
-			 */
-			printf("dbf attribute name %s is too long, must be "
-				"less than 32 characters.\n", ptr);
-			return 0;
+			if(!strncasecmp(field_name, dbf_flds[j], 10))
+			{
+				sprintf(field_name,"%.7s_%.2d",
+					ptr,
+					tmpint++);
+				j=-1; continue;
+			}
 		}
 
-
 		/* make UPPERCASE if keep_fieldname_case = 0 */
 		if (keep_fieldname_case == 0)
 			for(j=0; j<strlen(field_name); j++)
 				field_name[j] = toupper(field_name[j]);
 
-		/* 
-		 * make sure the fields all have unique names,
-		 * 10-digit limit on dbf names...
-		 */
-		for(j=0; j<i; j++)
-		{
-			/*
-			 * TODO: check out if should be case-insensitive
-			 * here since we might be running in -k mode
-			 */
-			if(strncmp(field_name, PQgetvalue(res, j, 0),10) == 0)
-			{
-		printf("\nWarning: Field '%s' has first 10 characters which "
-			"duplicate a previous field name's.\n"
-			"Renaming it to be: '",field_name);
-				strncpy(field_name,field_name,9);
-				field_name[9] = 0;
-				sprintf(field_name,"%s%d",field_name,i);
-				printf("%s'\n\n",field_name);
-			}
+		if ( strcasecmp(fname, field_name) ) {
+			fprintf(stderr, "Warning, field %s renamed to %s\n",
+				fname, field_name);
 		}
 
+		//fprintf(stderr, "DBFfield: %s\n", field_name);
+		dbf_flds[dbf_nfields++] = strdup(field_name);
+
 		/*
 		 * Find appropriate type of dbf attributes
 		 */
@@ -2586,7 +2578,7 @@ initialize(void)
 		/* integer type */
 		if(type == 20 || type == 21 || type == 23)
 		{
-			if(DBFAddField(dbf, field_name,FTInteger,16,0) == -1)
+			if(DBFAddField(dbf, field_name, FTInteger,16,0) == -1)
 			{
 				printf( "error - Field could not "
 					"be created.\n");
@@ -2652,6 +2644,9 @@ initialize(void)
 		mainscan_flds[mainscan_nflds++] = fname;
 	}
 
+	/* Release dbf field memory */
+	for (i=0; i<dbf_nfields; i++) free(dbf_flds[i]);
+
 	/*
 	 * If no geometry has been found
 	 * we have finished with initialization
@@ -3127,6 +3122,9 @@ create_usrquerytable(void)
 
 /**********************************************************************
  * $Log$
+ * Revision 1.74.2.2  2005/05/16 17:51:17  strk
+ * BUGFIX in attribute names unicity enforcement
+ *
  * Revision 1.74.2.1  2005/05/16 08:03:29  strk
  * Back-ported -k patch
  *
-- 
2.40.0