Changeset: 27147ad629b1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27147ad629b1 Modified Files: sql/backends/monet5/vaults/shp/75_shp.sql sql/backends/monet5/vaults/shp/Makefile.ag Branch: default Log Message:
corrected the makefile and sql script for the ESRI Shapefile vault diffs (53 lines): diff --git a/sql/backends/monet5/vaults/shp/75_shp.sql b/sql/backends/monet5/vaults/shp/75_shp.sql --- a/sql/backends/monet5/vaults/shp/75_shp.sql +++ b/sql/backends/monet5/vaults/shp/75_shp.sql @@ -1,20 +1,3 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://www.monetdb.org/Legal/MonetDBLicense -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2015 MonetDB B.V. -# All Rights Reserved. - -# This loads the MonetDB/SQL module -library shp; -include shp; +create procedure SHPattach(fname string) external name shp.attach; +create procedure SHPload(fid integer) external name shp.load; +create procedure SHPload(fid integer, filter geometry) external name shp.import; diff --git a/sql/backends/monet5/vaults/shp/Makefile.ag b/sql/backends/monet5/vaults/shp/Makefile.ag --- a/sql/backends/monet5/vaults/shp/Makefile.ag +++ b/sql/backends/monet5/vaults/shp/Makefile.ag @@ -34,19 +34,19 @@ lib__shp = { $(GDAL_LIBS) } -headers_lidarmal = { +headers_shpmal = { HEADERS = mal DIR = libdir/monetdb5 SOURCES = shp.mal } -headers_lidarsql = { +headers_shpsql = { HEADERS = sql DIR = libdir/monetdb5/createdb SOURCES = 75_shp.sql } -headers_lidarautoload = { +headers_shpautoload = { HEADERS = mal DIR = libdir/monetdb5/autoload SOURCES = 75_shp.mal _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
