[postgis-commits] svn - r2656 - in trunk: loader lwgeom

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2007-07-12 22:42:46 -0700 (Thu, 12 Jul 2007)
New Revision: 2656

Modified:
   trunk/loader/shp2pgsql.c
   trunk/lwgeom/lwgeom_transform.c
Log:
Correct previous commit for older PostgreSQL versions - the order of the methods in PROJ4SRSCacheContextMethods is not consistent between versions.

Modified: trunk/loader/shp2pgsql.c
===================================================================
--- trunk/loader/shp2pgsql.c	2007-07-12 20:33:23 UTC (rev 2655)
+++ trunk/loader/shp2pgsql.c	2007-07-13 05:42:46 UTC (rev 2656)
@@ -251,7 +251,8 @@
 	optr=result;
 	ptr=str;
 	while (*ptr) {
-		if ( *ptr == '\'' || *ptr == '\\' ) *optr++='\\';
+		if ( *ptr == '\'' ) *optr++='\'';
+        else if ( *ptr == '\\' ) *optr++='\\';
 		*optr++=*ptr++;
 	}
 	*optr='\0';

Modified: trunk/lwgeom/lwgeom_transform.c
===================================================================
--- trunk/lwgeom/lwgeom_transform.c	2007-07-12 20:33:23 UTC (rev 2655)
+++ trunk/lwgeom/lwgeom_transform.c	2007-07-13 05:42:46 UTC (rev 2656)
@@ -160,10 +160,11 @@
  	NULL,
  	PROJ4SRSCacheInit,
  	PROJ4SRSCacheReset,
- 	PROJ4SRSCacheDelete
+ 	PROJ4SRSCacheDelete,
 #ifdef MEMORY_CONTEXT_CHECKING
- 	,PROJ4SRSCacheCheck
+ 	PROJ4SRSCacheCheck,
 #endif
+    PROJ4SRSCacheStats
 };
 #endif
 
@@ -176,7 +177,7 @@
 	PROJ4SRSCacheReset,
 	PROJ4SRSCacheDelete,
 	NULL,
-	PROJ4SRSCacheIsEmpty
+	PROJ4SRSCacheStats
 #ifdef MEMORY_CONTEXT_CHECKING
  	,PROJ4SRSCacheCheck
 #endif
@@ -310,7 +311,7 @@
 	ctl.entrysize = sizeof(PJHashEntry);
 	ctl.hash = mcxt_ptr_hash;
 
-	return hash_create("PROJ4 Backend PJ MemoryContext Hash", PROJ4_BACKEND_HASH_SIZE, &ctl, (HASH_ELEM | HASH_FUNCTION));
+	return hash_create("PostGIS PROJ4 Backend PJ MemoryContext Hash", PROJ4_BACKEND_HASH_SIZE, &ctl, (HASH_ELEM | HASH_FUNCTION));
 }
 
 static void AddPJHashEntry(MemoryContext mcxt, PJ *projection)