versioning functions completed

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

diff --git a/lwgeom/MISSING_OBJECTS b/lwgeom/MISSING_OBJECTS
index cffc1be15f840636c9a0b6cd902e79867bc9f2d0..d049ce08ee277196b9bba1235053ba6352bc1c8d 100644 (file)
--- a/lwgeom/MISSING_OBJECTS
+++ b/lwgeom/MISSING_OBJECTS
@@ -136,8 +136,6 @@ FUNC: KEEPING FUNCTION: [collect_garray(geometry[])]
 FUNC: KEEPING FUNCTION: [geosnoop(geometry)]
 FUNC: KEEPING FUNCTION: [line_interpolate_point(geometry, double precision)]
 FUNC: KEEPING FUNCTION: [geometry_size(geometry, internal)]
-FUNC: KEEPING FUNCTION: [postgis_proj_version()]
-FUNC: KEEPING FUNCTION: [postgis_geos_version()]
 TYPE: KEEPING TYPE [box3d]
 TYPE: KEEPING TYPE [spheroid]
 TYPE: KEEPING TYPE [chip]

diff --git a/lwgeom/lwgeom_geos.c b/lwgeom/lwgeom_geos.c
index b734b7322be6d296b4002103f8f6d4b20c77b08b..9bc4376da753084df8dd98e78d0684bafe979b88 100644 (file)
--- a/lwgeom/lwgeom_geos.c
+++ b/lwgeom/lwgeom_geos.c
@@ -7,6 +7,13 @@
 extern char *GEOSversion();
 extern char *GEOSjtsport();
 
+void NOTICE_MESSAGE(char *msg);
+
+void NOTICE_MESSAGE(char *msg)
+{
+       elog(NOTICE,msg);
+}
+
 PG_FUNCTION_INFO_V1(postgis_geos_version);
 Datum postgis_geos_version(PG_FUNCTION_ARGS)
 {

diff --git a/lwgeom/lwpostgis.sql.in b/lwgeom/lwpostgis.sql.in
index d0a73d41a9ca267bfc5e3df95c2a533c1ad77253..ee2d11ac414a086349a5de6da5e1a999ada521a6 100644 (file)
--- a/lwgeom/lwpostgis.sql.in
+++ b/lwgeom/lwpostgis.sql.in
@@ -11,6 +11,9 @@
 --  
 -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 -- $Log$
+-- Revision 1.8  2004/08/23 15:57:56  strk
+-- versioning functions completed
+--
 -- Revision 1.7  2004/08/23 15:37:16  strk
 -- Changed SCRIPTS_VERSION to 0.0.1
 --
@@ -1822,53 +1825,53 @@ CREATEFUNCTION postgis_uses_stats() RETURNS bool
        AS '@MODULE_FILENAME@'
        LANGUAGE 'C';
 
---CREATEFUNCTION postgis_geos_version() RETURNS text
---     AS '@MODULE_FILENAME@'
---     LANGUAGE 'C';
---
+CREATEFUNCTION postgis_geos_version() RETURNS text
+       AS '@MODULE_FILENAME@'
+       LANGUAGE 'C';
 
---CREATEFUNCTION postgis_full_version() RETURNS text
---AS '
---DECLARE
---     libver text;
---     projver text;
---     geosver text;
---     usestats bool;
---     dbproc text;
---     relproc text;
---     fullver text;
---BEGIN
---     SELECT postgis_lib_version() INTO libver;
---     SELECT postgis_proj_version() INTO projver;
---     SELECT postgis_geos_version() INTO geosver;
---     SELECT postgis_uses_stats() INTO usestats;
---     SELECT postgis_scripts_installed() INTO dbproc;
---     SELECT postgis_scripts_released() INTO relproc;
---
---     fullver = \'POSTGIS="\' || libver || \'"\';
---
---     IF  geosver IS NOT NULL THEN
---             fullver = fullver || \' GEOS="\' || geosver || \'"\';
---     END IF;
---
---     IF  projver IS NOT NULL THEN
---             fullver = fullver || \' PROJ="\' || projver || \'"\';
---     END IF;
---
---     IF usestats THEN
---             fullver = fullver || \' USE_STATS\';
---     END IF;
---
---     fullver = fullver || \' DBPROC="\' || dbproc || \'"\';
---     fullver = fullver || \' RELPROC="\' || relproc || \'"\';
---
---     IF dbproc != relproc THEN
---             fullver = fullver || \' (needs proc upgrade)\';
---     END IF;
---
---     RETURN fullver;
---END
---' LANGUAGE 'plpgsql';
+
+CREATEFUNCTION postgis_full_version() RETURNS text
+AS '
+DECLARE
+       libver text;
+       projver text;
+       geosver text;
+       usestats bool;
+       dbproc text;
+       relproc text;
+       fullver text;
+BEGIN
+       SELECT postgis_lib_version() INTO libver;
+       SELECT postgis_proj_version() INTO projver;
+       SELECT postgis_geos_version() INTO geosver;
+       SELECT postgis_uses_stats() INTO usestats;
+       SELECT postgis_scripts_installed() INTO dbproc;
+       SELECT postgis_scripts_released() INTO relproc;
+
+       fullver = \'POSTGIS="\' || libver || \'"\';
+
+       IF  geosver IS NOT NULL THEN
+               fullver = fullver || \' GEOS="\' || geosver || \'"\';
+       END IF;
+
+       IF  projver IS NOT NULL THEN
+               fullver = fullver || \' PROJ="\' || projver || \'"\';
+       END IF;
+
+       IF usestats THEN
+               fullver = fullver || \' USE_STATS\';
+       END IF;
+
+       fullver = fullver || \' DBPROC="\' || dbproc || \'"\';
+       fullver = fullver || \' RELPROC="\' || relproc || \'"\';
+
+       IF dbproc != relproc THEN
+               fullver = fullver || \' (needs proc upgrade)\';
+       END IF;
+
+       RETURN fullver;
+END
+' LANGUAGE 'plpgsql';
 
 ---------------------------------------------------------------
 -- END