Changeset: 161e38631c41 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=161e38631c41 Modified Files: sql/backends/monet5/vaults/shp/75_shp.mal sql/backends/monet5/vaults/shp/75_shp.sql sql/backends/monet5/vaults/shp/shp.c sql/backends/monet5/vaults/shp/shp.h sql/backends/monet5/vaults/shp/shp.mal Branch: default Log Message:
Updated license information and author list diffs (172 lines): diff --git a/sql/backends/monet5/vaults/shp/75_shp.mal b/sql/backends/monet5/vaults/shp/75_shp.mal --- a/sql/backends/monet5/vaults/shp/75_shp.mal +++ b/sql/backends/monet5/vaults/shp/75_shp.mal @@ -1,20 +1,9 @@ -# 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 +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# 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. +# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. -# This loads the MonetDB/SQL module +# This loads the shapefile module library shp; include shp; 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,3 +1,9 @@ +-- This Source Code Form is subject to the terms of the Mozilla Public +-- License, v. 2.0. If a copy of the MPL was not distributed with this +-- file, You can obtain one at http://mozilla.org/MPL/2.0/. +-- +-- Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + 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/shp.c b/sql/backends/monet5/vaults/shp/shp.c --- a/sql/backends/monet5/vaults/shp/shp.c +++ b/sql/backends/monet5/vaults/shp/shp.c @@ -1,26 +1,19 @@ /* - * 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-2014 MonetDB B.V. - * All Rights Reserved. -*/ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + */ + +/* + * Authors: K. Kyzirakos, D. Savva + * This module contains primitives for accessing geospatial data + * stored in ESRI Shapefile documents. + */ #include <monetdb_config.h> #include <string.h> -/*#include <gdal.h>*/ -/*#include <ogr_api.h>*/ #include "sql_mvc.h" #include "sql.h" #include <stdlib.h> diff --git a/sql/backends/monet5/vaults/shp/shp.h b/sql/backends/monet5/vaults/shp/shp.h --- a/sql/backends/monet5/vaults/shp/shp.h +++ b/sql/backends/monet5/vaults/shp/shp.h @@ -1,20 +1,9 @@ /* - * 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-2014 MonetDB B.V. - * All Rights Reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. */ #ifndef _SHP_ @@ -25,7 +14,7 @@ #include <ogr_api.h> OGRErr OSRExportToProj4 (OGRSpatialReferenceH, char **); -OGRErr OSRExportToWkt (OGRSpatialReferenceH, char **); +OGRErr OSRExportToWkt (OGRSpatialReferenceH, char **); const char * OSRGetAttrValue (OGRSpatialReferenceH hSRS, const char *pszName, int iChild); /* CURRENT_TIMESTAMP() ?*/ @@ -73,7 +62,7 @@ void GDALWClose(GDALWConnection *); #ifdef WIN32 -#ifndef LIBGTIFF /* change it! */ +#ifndef LIBGTIFF /* change it! */ #define shp_export extern __declspec(dllimport) #else #define shp_export extern __declspec(dllexport) @@ -86,4 +75,3 @@ shp_export str SHPattach(Client cntxt, M shp_export str SHPimport(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); shp_export str SHPpartialimport(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); #endif - diff --git a/sql/backends/monet5/vaults/shp/shp.mal b/sql/backends/monet5/vaults/shp/shp.mal --- a/sql/backends/monet5/vaults/shp/shp.mal +++ b/sql/backends/monet5/vaults/shp/shp.mal @@ -1,27 +1,14 @@ -# 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 +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# 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-2014 MonetDB B.V. -# All Rights Reserved. - -# This extensions is developed by CWI in collaboration with University of Athens (UoA). +# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. module shp; pattern attach(filename:str) :void address SHPattach -comment "Register a SHP vector file in the vault catalog"; +comment "Register an ESRI Shapefile in the vault catalog"; pattern import(fileid:int) :void address SHPimport _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
