[postgis-commits] svn - r3870 - spike/wktraster/rt_pg
postgis-commits at postgis.refractions.net
postgis-commits at postgis.refractions.net
Mon Mar 16 03:56:41 PDT 2009
Author: mloskot
Date: 2009-03-16 03:56:40 -0700 (Mon, 16 Mar 2009)
New Revision: 3870
Modified:
spike/wktraster/rt_pg/rtpostgis.sql.in.c
Log:
rt_pg/rtpostgis.sql.in.c: re-indeted.
Modified: spike/wktraster/rt_pg/rtpostgis.sql.in.c
===================================================================
--- spike/wktraster/rt_pg/rtpostgis.sql.in.c 2009-03-15 02:48:19 UTC (rev 3869)
+++ spike/wktraster/rt_pg/rtpostgis.sql.in.c 2009-03-16 10:56:40 UTC (rev 3870)
@@ -35,21 +35,21 @@
-------------------------------------------------------------------
CREATEFUNCTION rt_raster_in(cstring)
- RETURNS raster
- AS 'MODULE_PATHNAME','RASTER_in'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS raster
+ AS 'MODULE_PATHNAME','RASTER_in'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_raster_out(raster)
- RETURNS cstring
- AS 'MODULE_PATHNAME','RASTER_out'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS cstring
+ AS 'MODULE_PATHNAME','RASTER_out'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATE TYPE raster (
- alignment = double,
- internallength = variable,
- input = rt_raster_in,
- output = rt_raster_out,
- storage = extended
+ alignment = double,
+ internallength = variable,
+ input = rt_raster_in,
+ output = rt_raster_out,
+ storage = extended
);
-------------------------------------------------------------------
@@ -72,90 +72,90 @@
LANGUAGE 'C' IMMUTABLE;
CREATEFUNCTION rt_raster_to_box2d(raster)
- RETURNS BOX2D
- AS 'MODULE_PATHNAME','RASTER_to_BOX2DFLOAT4'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS BOX2D
+ AS 'MODULE_PATHNAME','RASTER_to_BOX2DFLOAT4'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_raster_envelope(raster)
- RETURNS GEOMETRY
- AS 'MODULE_PATHNAME','RASTER_envelope'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS GEOMETRY
+ AS 'MODULE_PATHNAME','RASTER_envelope'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_srid(raster)
- RETURNS integer
- AS 'MODULE_PATHNAME','RASTER_getSRID'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS integer
+ AS 'MODULE_PATHNAME','RASTER_getSRID'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_width(raster)
- RETURNS integer
- AS 'MODULE_PATHNAME','RASTER_getWidth'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS integer
+ AS 'MODULE_PATHNAME','RASTER_getWidth'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_height(raster)
- RETURNS integer
- AS 'MODULE_PATHNAME','RASTER_getHeight'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS integer
+ AS 'MODULE_PATHNAME','RASTER_getHeight'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_pixelsizex(raster)
- RETURNS float8
- AS 'MODULE_PATHNAME','RASTER_getXPixelSize'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS float8
+ AS 'MODULE_PATHNAME','RASTER_getXPixelSize'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_pixelsizey(raster)
- RETURNS float8
- AS 'MODULE_PATHNAME','RASTER_getYPixelSize'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS float8
+ AS 'MODULE_PATHNAME','RASTER_getYPixelSize'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_rotationx(raster)
- RETURNS float8
- AS 'MODULE_PATHNAME','RASTER_getXRotation'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS float8
+ AS 'MODULE_PATHNAME','RASTER_getXRotation'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_rotationy(raster)
- RETURNS float8
- AS 'MODULE_PATHNAME','RASTER_getYRotation'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS float8
+ AS 'MODULE_PATHNAME','RASTER_getYRotation'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_upperleftx(raster)
- RETURNS float8
- AS 'MODULE_PATHNAME','RASTER_getXUpperLeft'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS float8
+ AS 'MODULE_PATHNAME','RASTER_getXUpperLeft'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_upperlefty(raster)
- RETURNS float8
- AS 'MODULE_PATHNAME','RASTER_getYUpperLeft'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS float8
+ AS 'MODULE_PATHNAME','RASTER_getYUpperLeft'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_georeference(raster)
- RETURNS TEXT
- AS 'MODULE_PATHNAME','RASTER_getGeoReference'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS TEXT
+ AS 'MODULE_PATHNAME','RASTER_getGeoReference'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_numbands(raster)
- RETURNS integer
- AS 'MODULE_PATHNAME','RASTER_getNumBands'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS integer
+ AS 'MODULE_PATHNAME','RASTER_getNumBands'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_bandpixeltype(raster, integer)
- RETURNS text
- AS 'MODULE_PATHNAME','RASTER_getBandPixelTypeName'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
-
+ RETURNS text
+ AS 'MODULE_PATHNAME','RASTER_getBandPixelTypeName'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
+
CREATEFUNCTION rt_bandnodatavalue(raster, integer)
- RETURNS float4
- AS 'MODULE_PATHNAME','RASTER_getBandNoDataValue'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS float4
+ AS 'MODULE_PATHNAME','RASTER_getBandNoDataValue'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
CREATEFUNCTION rt_value(raster, integer, integer, integer)
- RETURNS float8
- AS 'MODULE_PATHNAME','RASTER_getPixelValue'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS float8
+ AS 'MODULE_PATHNAME','RASTER_getPixelValue'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
-- TODO: To be implemented
CREATEFUNCTION rt_setvalue(raster, integer, integer, integer, float8)
- RETURNS float8
- AS 'MODULE_PATHNAME','RASTER_setPixelValue'
- LANGUAGE 'C' _IMMUTABLE_STRICT;
+ RETURNS float8
+ AS 'MODULE_PATHNAME','RASTER_setPixelValue'
+ LANGUAGE 'C' _IMMUTABLE_STRICT;
--
-- rt_MakeEmptyRaster( <width>, <height>, <ipx>, <ipy>,
-- <scalex>, <scaley>,
@@ -347,10 +347,10 @@
extent GEOMETRY,
CONSTRAINT raster_columns_pk primary key (
- r_table_catalog,
- r_table_schema,
- r_table_name,
- r_column )
+ r_table_catalog,
+ r_table_schema,
+ r_table_name,
+ r_column )
) WITH OIDS;
@@ -386,11 +386,11 @@
DECLARE
-- Function arguments
- p_catalog_name ALIAS FOR $1;
- p_schema_name ALIAS FOR $2;
- p_table_name ALIAS FOR $3;
- p_column_name ALIAS FOR $4;
- p_srid ALIAS FOR $5;
+ p_catalog_name ALIAS FOR $1;
+ p_schema_name ALIAS FOR $2;
+ p_table_name ALIAS FOR $3;
+ p_column_name ALIAS FOR $4;
+ p_srid ALIAS FOR $5;
p_pixel_types ALIAS FOR $6;
p_nodata_values ALIAS FOR $7;
p_out_db ALIAS FOR $8;
@@ -404,10 +404,10 @@
-- Local helpers
pixel_types varchar[];
- srid_into varchar;
+ srid_into varchar;
pixel_types_found integer = 0;
- real_schema name;
- sql text;
+ real_schema name;
+ sql text;
BEGIN
@@ -417,13 +417,13 @@
p_pixelsize_x, p_pixelsize_y, p_blocksize_x, p_blocksize_y;
-- Verify SRID
- IF ( (p_srid != 0) AND (p_srid != -1) ) THEN
- SELECT SRID INTO srid_into FROM spatial_ref_sys WHERE SRID = p_srid;
- IF NOT FOUND THEN
- RAISE EXCEPTION 'Invalid SRID';
- RETURN 'fail';
- END IF;
- END IF;
+ IF ( (p_srid != 0) AND (p_srid != -1) ) THEN
+ SELECT SRID INTO srid_into FROM spatial_ref_sys WHERE SRID = p_srid;
+ IF NOT FOUND THEN
+ RAISE EXCEPTION 'Invalid SRID';
+ RETURN 'fail';
+ END IF;
+ END IF;
-- Verify PIXEL TYPE
-- TODO: If only PostgreSQL 8.2+ supported, use @> operator instead of brute-force lookup
@@ -441,73 +441,73 @@
END LOOP;
IF pixel_types_found = 0 THEN
- RAISE EXCEPTION 'Invalid pixel type % - valid ones are %', p_pixel_types[npti], pixel_types;
- RETURN 'fail';
+ RAISE EXCEPTION 'Invalid pixel type % - valid ones are %', p_pixel_types[npti], pixel_types;
+ RETURN 'fail';
END IF;
END LOOP;
-- Verify SCHEMA
IF ( p_schema_name IS NOT NULL AND p_schema_name != '' ) THEN
- sql := 'SELECT nspname FROM pg_namespace ' ||
- 'WHERE text(nspname) = ' || quote_literal(p_schema_name) ||
- 'LIMIT 1';
- RAISE DEBUG '%', sql;
- EXECUTE sql INTO real_schema;
+ sql := 'SELECT nspname FROM pg_namespace ' ||
+ 'WHERE text(nspname) = ' || quote_literal(p_schema_name) ||
+ 'LIMIT 1';
+ RAISE DEBUG '%', sql;
+ EXECUTE sql INTO real_schema;
- IF ( real_schema IS NULL ) THEN
- RAISE EXCEPTION 'Schema % is not a valid schemaname', quote_literal(p_schema_name);
- RETURN 'fail';
- END IF;
- END IF;
-
- IF ( real_schema IS NULL ) THEN
- RAISE DEBUG 'Detecting schema';
- sql := 'SELECT n.nspname AS schemaname ' ||
- 'FROM pg_catalog.pg_class c ' ||
- 'JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace ' ||
- 'WHERE c.relkind = ' || quote_literal('r') ||
- ' AND n.nspname NOT IN (' || quote_literal('pg_catalog') || ', ' || quote_literal('pg_toast') || ')' ||
- ' AND pg_catalog.pg_table_is_visible(c.oid)' ||
- ' AND c.relname = ' || quote_literal(p_table_name);
- RAISE DEBUG '%', sql;
- EXECUTE sql INTO real_schema;
+ IF ( real_schema IS NULL ) THEN
+ RAISE EXCEPTION 'Schema % is not a valid schemaname', quote_literal(p_schema_name);
+ RETURN 'fail';
+ END IF;
+ END IF;
+
+ IF ( real_schema IS NULL ) THEN
+ RAISE DEBUG 'Detecting schema';
+ sql := 'SELECT n.nspname AS schemaname ' ||
+ 'FROM pg_catalog.pg_class c ' ||
+ 'JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace ' ||
+ 'WHERE c.relkind = ' || quote_literal('r') ||
+ ' AND n.nspname NOT IN (' || quote_literal('pg_catalog') || ', ' || quote_literal('pg_toast') || ')' ||
+ ' AND pg_catalog.pg_table_is_visible(c.oid)' ||
+ ' AND c.relname = ' || quote_literal(p_table_name);
+ RAISE DEBUG '%', sql;
+ EXECUTE sql INTO real_schema;
- IF ( real_schema IS NULL ) THEN
- RAISE EXCEPTION 'Table % does not occur in the search_path', quote_literal(p_table_name);
- RETURN 'fail';
- END IF;
- END IF;
+ IF ( real_schema IS NULL ) THEN
+ RAISE EXCEPTION 'Table % does not occur in the search_path', quote_literal(p_table_name);
+ RETURN 'fail';
+ END IF;
+ END IF;
- -- Add raster column to target table
- sql := 'ALTER TABLE ' ||
- quote_ident(real_schema) || '.' || quote_ident(p_table_name)
- || ' ADD COLUMN ' || quote_ident(p_column_name) ||
- ' raster ';
- RAISE DEBUG '%', sql;
- EXECUTE sql;
+ -- Add raster column to target table
+ sql := 'ALTER TABLE ' ||
+ quote_ident(real_schema) || '.' || quote_ident(p_table_name)
+ || ' ADD COLUMN ' || quote_ident(p_column_name) ||
+ ' raster ';
+ RAISE DEBUG '%', sql;
+ EXECUTE sql;
- -- Delete stale record in RASTER_COLUMNS (if any)
- sql := 'DELETE FROM raster_columns ' ||
+ -- Delete stale record in RASTER_COLUMNS (if any)
+ sql := 'DELETE FROM raster_columns ' ||
' WHERE r_table_catalog = ' || quote_literal('') ||
- ' AND r_table_schema = ' || quote_literal(real_schema) ||
- ' AND r_table_name = ' || quote_literal(p_table_name) ||
- ' AND r_column = ' || quote_literal(p_column_name);
- RAISE DEBUG '%', sql;
- EXECUTE sql;
+ ' AND r_table_schema = ' || quote_literal(real_schema) ||
+ ' AND r_table_name = ' || quote_literal(p_table_name) ||
+ ' AND r_column = ' || quote_literal(p_column_name);
+ RAISE DEBUG '%', sql;
+ EXECUTE sql;
- -- Add record in RASTER_COLUMNS
- sql := 'INSERT INTO raster_columns ' ||
+ -- Add record in RASTER_COLUMNS
+ sql := 'INSERT INTO raster_columns ' ||
' (r_table_catalog, r_table_schema, r_table_name, r_column, out_db, srid, pixel_types) ' ||
- ' VALUES (' ||
- quote_literal('') || ',' ||
- quote_literal(real_schema) || ',' ||
- quote_literal(p_table_name) || ',' ||
- quote_literal(p_column_name) || ',' ||
- p_out_db::text || ',' ||
- p_srid::text || ',' ||
+ ' VALUES (' ||
+ quote_literal('') || ',' ||
+ quote_literal(real_schema) || ',' ||
+ quote_literal(p_table_name) || ',' ||
+ quote_literal(p_column_name) || ',' ||
+ p_out_db::text || ',' ||
+ p_srid::text || ',' ||
quote_literal(p_pixel_types::text) || ')';
- RAISE DEBUG '%', sql;
- EXECUTE sql;
+ RAISE DEBUG '%', sql;
+ EXECUTE sql;
RAISE NOTICE 'TODO: Constraints not implemented';
@@ -545,10 +545,10 @@
RETURNS text AS $$
DECLARE
- ret text;
+ ret text;
BEGIN
--SELECT AddRasterColumn('',$1,$2,$3,$4,$5,$6,'f','f',0,0,0,0, 'POINT(0 0)'::geometry) into ret;
- --RETURN ret;
+ --RETURN ret;
RAISE NOTICE 'TODO: not implemented';
RETURN 'fail';
END;
@@ -569,10 +569,10 @@
AS
$$
DECLARE
- catalog_name alias for $1;
- schema_name alias for $2;
- table_name alias for $3;
- column_name alias for $4;
+ catalog_name alias for $1;
+ schema_name alias for $2;
+ table_name alias for $3;
+ column_name alias for $4;
BEGIN
More information about the postgis-commits
mailing list