From: Sandro Santilli <strk@keybit.net>
Date: Wed, 10 Mar 2004 17:23:56 +0000 (+0000)
Subject: code cleanup, fixed a bug missing to transform 'gid' to 'gid__2' in shapefile attribu... 
X-Git-Tag: pgis_0_8_2~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37e2d3b3fa746ace20e1b14b62a5f65ced33d927;p=postgis

code cleanup, fixed a bug missing to transform 'gid' to 'gid__2' in shapefile attribute name


git-svn-id: http://svn.osgeo.org/postgis/trunk@483 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/loader/shp2pgsql.c b/loader/shp2pgsql.c
index e3194da87..ab7997fc8 100644
--- a/loader/shp2pgsql.c
+++ b/loader/shp2pgsql.c
@@ -12,6 +12,9 @@
  * 
  **********************************************************************
  * $Log$
+ * Revision 1.51  2004/03/10 17:23:56  strk
+ * code cleanup, fixed a bug missing to transform 'gid' to 'gid__2' in shapefile attribute name
+ *
  * Revision 1.50  2004/03/06 17:43:06  strk
  * Added RCSID string in usage output
  *
@@ -755,15 +758,25 @@ int main (int ARGC, char **ARGV){
 		strcpy(col_names, "(" );
 	}
 
-	for(j=0;j<num_fields;j++){
+	for(j=0;j<num_fields;j++)
+	{
 		type = DBFGetFieldInfo(hDBFHandle, j, name, &field_width, &field_precision); 
 
 //fprintf(stderr, "Field %d (%s) width/decimals: %d/%d\n", j, name, field_width, field_precision);
-		names[j] = malloc ( strlen(name)+3 );
 		types[j] = type;
 		widths[j] = field_width;
 		precisions[j] = field_precision;
-		strcpy(names[j], name);
+
+		/*
+		 * Make field names lowercase unless asked to
+		 * quote identifiers
+		 */
+		if ( ! quoteidentifiers ) {
+			for(z=0; z<strlen(name) ;z++)
+				name[z] = tolower(name[z]);
+		}
+
+		/* Avoid duplicating field names */
 		for(z=0; z < j ; z++){
 			if(strcmp(names[z],name)==0){
 				strcat(name,"__");
@@ -771,31 +784,25 @@ int main (int ARGC, char **ARGV){
 				break;
 			}
 		}	
-		if(strcasecmp(name,"gid")==0){
-			if(j ==0){
-				sprintf(col_names,"%s%s__2",col_names,name);
-			}else{
-				sprintf(col_names,"%s,%s__2",col_names,name);
-			}
-		}else{
-			if ( quoteidentifiers ){
-				if(j ==0){
-					sprintf(col_names,"%s\"%s\"",col_names,name);
-				}else{
-					sprintf(col_names,"%s,\"%s\"",col_names,name);
-				}
-			}else{
-				if(j ==0){
-					sprintf(col_names,"%s%s",col_names,name);
-				}else{
-					sprintf(col_names,"%s,%s",col_names,name);
-				}
-			}
+
+		/*
+		 * Avoid duplicating system fields
+		 * (currently only gid is handled)
+		 */
+		if( strcmp(name,"gid")==0 )
+		{
+			strcat(name,"__2");
 		}
+
+		names[j] = malloc ( strlen(name)+3 );
+		strcpy(names[j], name);
+
+		if (j) strcat(col_names, ",");
+		else sprintf(col_names, "(");
+		sprintf(col_names, "%s\"%s\"", col_names, name);
 	}
 	strcat(col_names, ",the_geom)");
 
-
 	//if opt is 'a' do nothing, go straight to making inserts
 	if(opt == 'c' || opt == 'd')
 	{
@@ -820,8 +827,7 @@ int main (int ARGC, char **ARGV){
 			field_width = widths[j];
 			field_precision = precisions[j];
 
-			if ( quoteidentifiers ) printf(", \"%s\" ", names[j]);
-			else printf(", %s ", names[j]);
+			printf(", \"%s\" ", names[j]);
 
 			if(hDBFHandle->pachFieldType[j] == 'D' ) /* Date field */
 			{